gentoo resync : 18.11.2019

3 files changed, 2 insertions, 224 deletions

diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 1e13e042c400..9a3ce8d84f27 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -3,6 +3,5 @@ AUX dspam.cron-r4 160 BLAKE2B 55a8bc86a1ea34ea8a17a8dd41cb21625682e94d02086060a5
 AUX dspam.initd 867 BLAKE2B c0dd2e67cb57b646b95b2b5cdf12aeea647166fde24036497e5e528e2bb6b66312e12c9895397f3dafb525dd12d528cb0550250e25d320ea133098be50adba88 SHA512 19d9abe29187612e358f4d7c428cf7313254e06e378f8ab5b6996871e80b6ceaf7c63763a6f6a4c3e4c0ff5d0d303a341c8995d87927f8f5b38580583af9a8f8
 AUX dspam.logrotate 180 BLAKE2B 157570caf3ce9885ded6aaf99f189985a730306e7a15cdb77dfc050134e75722ac0d82b27f69ed9478b252e458a39b3705801d9829d4759cf439a892aaf66275 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389
 DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856
-EBUILD dspam-3.10.2-r1.ebuild 5977 BLAKE2B f988cf01a109b7a96462c4de3e7e432f53a3e69533322e9bef453b651bbdd09ebe9cf18c65b2880ab2fbb6fdc697409205213ee50ffb0794c685ca69cd336a58 SHA512 f6f45d8fdd212442d289c535e260fe79274ebb84356a0dbb7b72b207278dc0ddd89d6fb255fd8d77945600bc9209b291737246a616caf89d9f3c44f9ed791554
-EBUILD dspam-3.10.2-r2.ebuild 5935 BLAKE2B c944b14fdd51d7e3a62e325c49e5cd240b9f573016194ad81aca4f50fa92d1efa3e61539d9ee80b3c0ff6bd04443327ec60e40a4b29ef9c63b624d102ff5beca SHA512 2d19c6567c14d35ed88c4586fb35a6390af92582f67f169f94dc0c25cae7f818cd0140729d3ba6112bfb891c0cd92ed09ab6c0db5cf6c1e3f79dc557702a8ab6
+EBUILD dspam-3.10.2-r2.ebuild 5933 BLAKE2B 124d4a8e3bcc45c75df78a47a895f97717662c8026e889dbaa7b70ffba4277fc2a126e8e2f46903299567f886295823083d037726c345974d5403dff910b1b64 SHA512 b140a514d4257d9aa40206879563e27b30d8287810a41fbd1a78d656618d7e68b1bcfe429c8a666069c8cac3e5f6d979303757bedd38f40418435921702d4db7
 MISC metadata.xml 1080 BLAKE2B 99fe9506bc845c43f298230a531ea6e463dae9ffa353b7e55c1133f0ee37d10e2b0846f6edc726fd690e1ec637809e4e2fdb5a04456b80b7382fd767b39b44e3 SHA512 963fd0fc0c898ad12877e5905917d0b733cf8e52c62d254955455b60e60eacd1b909c998e3e88c030cfd9024786da80920222369939a189d8e142500a13a636f
diff --git a/mail-filter/dspam/dspam-3.10.2-r1.ebuild b/mail-filter/dspam/dspam-3.10.2-r1.ebuild
deleted file mode 100644
index 1268a245ed41..000000000000
--- a/mail-filter/dspam/dspam-3.10.2-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-HOMEPAGE="http://dspam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-DRIVERS_IUSE="+hash mysql postgres sqlite"
-SCALES_IUSE="small-scale +domain-scale large-scale"
-IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"
-
-DEPEND="
-	net-mail/mailbase
-	ldap? ( net-nds/openldap )
-	mysql? ( >=virtual/mysql-5.0 )
-	postgres? ( dev-db/postgresql )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="
-	${DEPEND}
-	clamav? ( app-antivirus/clamav )
-	syslog?	( virtual/logger )
-"
-
-# Demands on sane USE flags:
-# - find out what driver to use: select at least one
-# - if static-libs is set, only one driver may be selected
-# - find out what scale to use: select exactly one
-# - user-homedirs does not work with virtual-users
-REQUIRED_USE="
-	|| ( ${DRIVERS_IUSE//+} )
-	static-libs? ( ^^ ( ${DRIVERS_IUSE//+} ) )
-	^^ ( ${SCALES_IUSE//+} )
-	virtual-users? ( !user-homedirs )
-"
-
-# dspam setup defaults
-DSPAM_HOME=/var/spool/dspam
-DSPAM_CONF=/etc/dspam
-DSPAM_LOG=/var/log/dspam
-DSPAM_MODE=2510
-DSPAM_DRIVERS=
-DSPAM_DRIVERS_EXTRAS=
-
-pkg_setup() {
-	# setup storage, this sets DSPAM_DRIVERS
-	dspam_setup_storage_drivers
-
-	# create dspam user and group
-	dspam_setup_user
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=${DSPAM_CONF} \
-		--with-dspam-home=${DSPAM_HOME} \
-		--with-dspam-home-group=dspam \
-		--with-dspam-mode=${DSPAM_MODE} \
-		--with-dspam-group=dspam \
-		--with-logdir=${DSPAM_LOG} \
-		--enable-external-lookup \
-		--enable-long-usernames \
-		--enable-split-configuration \
-		$(use_enable clamav) \
-		$(use_enable daemon) \
-		$(use_enable debug) \
-		$(use_enable debug bnr-debug) \
-		$(use_enable debug verbose-debug) \
-		$(use_enable domain-scale) \
-		$(use_enable large-scale) \
-		$(use_enable static-libs static) \
-		$(use_enable syslog) \
-		$(use_enable user-homedirs homedir) \
-		$(use_enable virtual-users) \
-		--with-storage-driver=${DSPAM_DRIVERS} ${DSPAM_DRIVERS_EXTRAS} \
-		$(use mysql || use postgres && echo "--enable-preferences-extension") \
-		$(use syslog || echo "--with-logfile=${DSPAM_LOG}/dspam.log")
-}
-
-dspam_setup_user() {
-	# DSPAM CGI web gui (www-apps/dspam-web) needs to run as a regular user
-	# under suexec in apache, so DSPAM user/group need to be regular users too
-
-	local euid egid
-	for euid in {1000..5000} ; do
-		[ -z "$(egetent passwd ${euid})" ] && break
-	done
-	for egid in {1000..5000} ; do
-		[ -z "$(egetent group ${egid})" ] && break
-	done
-	enewgroup dspam ${egid}
-	enewuser dspam ${euid} -1 "${DSPAM_HOMEDIR}" dspam,mail
-}
-
-dspam_setup_storage_drivers() {
-	# Find out which storage drivers need to be enabled, and set some
-	# variables so that src_configure can pick them up
-
-	if use hash; then
-		DSPAM_DRIVERS+=",hash_drv"
-	fi
-
-	if use mysql; then
-		DSPAM_DRIVERS+=",mysql_drv"
-		DSPAM_DRIVERS_EXTRAS+="--with-mysql-includes=/usr/include/mysql "
-	fi
-
-	if use postgres; then
-		DSPAM_DRIVERS+=",pgsql_drv"
-	fi
-
-	if use sqlite; then
-		DSPAM_DRIVERS+=",sqlite3_drv"
-	fi
-
-	if ! use static-libs; then
-		# set the driver name twice to avoid a static build
-		DSPAM_DRIVERS+=${DSPAM_DRIVERS}
-	fi
-
-	# remove first comma separator
-	DSPAM_DRIVERS=${DSPAM_DRIVERS:1}
-	einfo "Building with drivers: ${DSPAM_DRIVERS}"
-	#echo DSPAM_DRIVERS_EXTRAS=$DSPAM_DRIVERS_EXTRAS
-}
-
-src_install() {
-	default
-
-	if use daemon; then
-		newinitd "${FILESDIR}/dspam.initd" dspam
-		newconfd "${FILESDIR}/dspam.confd" dspam
-	fi
-
-	if use mysql; then
-		insinto "/usr/share/${PN}/mysql"
-
-		local files="mysql_objects-4.1.sql mysql_objects-space.sql mysql_objects-speed.sql purge-4.1.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_user_aliases.sql virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.mysql_drv/${file}
-		done
-	fi
-
-	if use postgres; then
-		insinto "/usr/share/${PN}/pgsql"
-
-		local files="pgsql_objects.sql purge-pe.sql purge.sql"
-		if use virtual-users; then
-			files+=" virtual_users.sql"
-		fi
-
-		for file in $files; do
-			doins src/tools.pgsql_drv/${file}
-		done
-	fi
-
-	if use sqlite; then
-		insinto "/usr/share/${PN}/sqlite"
-		newins src/tools.sqlite_drv/purge-3.sql purge.sql
-	fi
-
-	insinto "${DSPAM_HOME}/txt"
-	doins txt/*.txt
-	for i in spam nonspam; do
-		echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}"
-		doins "${T}/msgtag.${i}"
-	done
-
-	newbin contrib/dspam_maintenance/dspam_maintenance.sh dspam_maintenance
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/dspam.cron-r4" dspam
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/dspam.logrotate" dspam
-
-	dodoc CHANGELOG README* RELEASE.NOTES UPGRADING doc/*.txt
-
-	# stop logrotate-3.8 from complaining
-	dodir /var/log/dspam
-	fowners dspam:dspam /var/log/dspam
-	fperms 0750 /var/log/dspam
-
-	# Install dspamc setgid
-	fowners root:dspam /usr/bin/dspamc &&
-		fperms g+s /usr/bin/dspamc ||
-		die "failed to alter dspamc owner:group or mode"
-}
-
-pkg_preinst() {
-	# dspam-3.10.0: config dir change, should be removed at some later point
-	if [ -d "${ROOT}/etc/mail/dspam" ]; then
-		ewarn "The configuration directory of DSPAM has been relocated from /etc/mail/dspam to ${DSPAM_CONF}."
-		if [ -h "${ROOT}${DSPAM_CONF}" ]; then
-			# symlink, this is the setup in older ebuilds
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			rm "${ROOT}${DSPAM_CONF}" && mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-
-		elif [ -d "${ROOT}${DSPAM_CONF}" ]; then
-			# directory and no symlink, do it manually since we cannot decide.
-			ewarn "You have both /etc/mail/dspam and ${DSPAM_CONF} directories, please delete the former."
-
-		else
-			# nothing interesting in /etc/dspam
-			ewarn "Moving contents of /etc/mail/dspam to ${DSPAM_CONF} ..."
-			mv "${ROOT}/etc/mail/dspam" "${DSPAM_CONF}"
-			eend $?
-		fi
-	fi
-}
diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
index eb4899d3022e..0144efda5694 100644
--- a/mail-filter/dspam/dspam-3.10.2-r2.ebuild
+++ b/mail-filter/dspam/dspam-3.10.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 DRIVERS_IUSE="+hash mysql postgres sqlite"
 SCALES_IUSE="small-scale +domain-scale large-scale"
 IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}"