gentoo resync : 12.08.2018

7 files changed, 8 insertions, 255 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 44dd2d530d89..564c1b4a7fee 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 5f1687c5c973..523f3cdbc78d 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -18,4 +18,4 @@ EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3
 EBUILD rspamd-1.7.8.ebuild 2139 BLAKE2B 0352647a74ab84ba452f37f9c8a971f899dddb4ad61779ae8096794d63ede23729b3723700b28824f270761624230a3da8dbff5a83ccc1b1bda5232ce8ef9414 SHA512 bf624d2c221b4422180a09d4599c91c10e9cc2c204cc26d7fbcb258becbd96b2e1822b45ae65e97cb93db40737400d77e3bdd8e48ed5a9129d9bd6cd70ecacc8
 EBUILD rspamd-1.7.9.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
 EBUILD rspamd-9999.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0
-MISC metadata.xml 905 BLAKE2B 2b14bdf8077a435c70da3c7d3c259a457a2defa947674365ea9928b070efecc6e6aac2bfc3663d9125be6c4844e3dda0e79feeb8c96d7cf3495fb16605cbf39b SHA512 16d6df60d418d067d25b0ad42abdc9a0b36b4ac94ef96c3d3c48c725eab09ec59a2e9808a70065714f18eb6c7150ca8379763f0c5e14b04e3ed47c4167fb7e1e
+MISC metadata.xml 905 BLAKE2B 6a7f5f1473668977870cafbf01b9396324f47cb6b998dbde0fde43d71facf1f818d97b10fc853ff331941f31445202457e9108a46201f5ce5ea6762ac905c829 SHA512 2233d0816b80b113fcf1ec75a0808bd694a83738e7f70d5cbb01dcaa127cfe11253e7f5ca9c9801820b7b21b3cd6a80bec2ea428b026311583a05fda8fc3d815
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index e33a8b25150b..13dc9bdd1539 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -5,14 +5,14 @@
     <email>c@roessner.co</email>
     <name>Christian Roessner</name>
   </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="person">
     <email>djc@gentoo.org</email>
     <name>Dirkjan Ochtman</name>
   </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">vstakhov/rspamd</remote-id>
   </upstream>
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 3d4b22234f37..1bb6b4f2b3fe 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -22,6 +22,5 @@ AUX update-spamassassin-rules.cron 1378 BLAKE2B 0fda2be565deae75c0248c6dfc5abfc0
 DIST Mail-SpamAssassin-3.4.1.tar.bz2 2710985 BLAKE2B f85b0ed2bae783bc6dfa39df36589a6cb90e6c657efcff1fa094f952847e4bcb24aa232b6689804bb1170204ae1d33216ed9bde207d7a7a6863410d8f847c391 SHA512 91d50e2ce6520e3e1c7bc66da133a0815be34ced15e26b6e6c17af5a03d5c62f41d8086f25f65084d6634497148cf5439977d7d4a44d7c3e307535beac6629af
 EBUILD spamassassin-3.4.1-r19.ebuild 7828 BLAKE2B 2cbf6260632b4fba3e0f25eeb4301be18a321768d6ac77f479d0d0bb7914fb978b59817db61ac35acb19386b2831381f1e6f7784dd8c72f94999c0c9e8cb718c SHA512 822bbd4cefdd73a8174072c2131cd8deead8416192ce7b9373165476cdaa2b3056b589d9143fc84944ad9bd312333852cd510e3ac949afba5310fda9a778b64c
 EBUILD spamassassin-3.4.1-r20.ebuild 7814 BLAKE2B 144d0498236d9f504e252d7dea23910a7ece9739a8df0a2f840be25ae656702f64847f533b5dcbd54761e3fb5e073b49ca117107269b5bc25a36ab64c0d52468 SHA512 3bc999d93244311e074cbecf3b6e4ad7db065b8ddeb1a13f0cd93e654ed7694d8c527b35dc624479efb56bdb050fa46996a5a8bce15fa3968e26970e87552d32
-EBUILD spamassassin-3.4.1-r21.ebuild 7871 BLAKE2B ff2f826d8de273481c200f349b2d3758e203c2b99612cd6967b7c531dff7c844ac7d625bb7a441292e67fd19b927c2e1f508301e130d72f010c17215400b738d SHA512 5cd37c17c60505f62d70172a0363053f63396a1d4ecdde6fb6e000614076fba9f9ed2b6624a37cda08ef611cdcf6d3ee57426ec2d80fe821b7857401f0def882
-EBUILD spamassassin-3.4.1-r8.ebuild 7015 BLAKE2B 5466900b7ca4b9cfbbc2418e09eec5aed875706fe04b3376f76b9a3c90bd74ee6adf35756142b9f468621d93080061fe48d8f75507c71b8cbd1753aede190717 SHA512 f54d7d5799dd3d708c8d2fede69285089d796878a2344c421bd56ffcd8cb0e2136f8e574d114ab7e5ae4dcfebe61d741777bf4dd777a344cbfaf48f6653538f8
-MISC metadata.xml 1116 BLAKE2B c9879a85394a1dacac44bc073ec568ba50ac62f44eab9948cecbf19b49c12bb6a074279316d5cae97b396b59d9e9fca0243197073e08b0d6afafe4e22b7d6a71 SHA512 f0ec3654c51ab783c40e072fd87e5347931b3678537ad37491df3eee183be2060901effc93a343c20beff80f3175a41aeb417b5f0fdee19416df329435d221ef
+EBUILD spamassassin-3.4.1-r21.ebuild 7867 BLAKE2B 7908223347fa7e36c8bacd98895c7cc3376b3bf53a9a57c8721f7388d756b34124c3d5e97f64cd8a661133a7626c639da522560156b6f54c5457f79b4cc460ed SHA512 3cfcee71f47b88ac2b34cc3e4aa10bff8a341774931c81464c6aae838275b8766f7d25103d76f3ae650b90af36f8cbbe6998196d520f2814f17c5bb18357b121
+MISC metadata.xml 807 BLAKE2B 14bf38e1888040ece6a48e7a8234917d5f9ae8d699995a0414520c0d262b91518c233ee3d3b1d13d7b5068fea8ec612bfee2a84ce825748e471b6ba6c25728b5 SHA512 2cc4534cdb5ed62612419a99a67e9e8e1867ba73a2daf957e3df8e7f2fd0bd058b7c9bb31fdfadb56d4001ce89e66d8f9da89d620e482d8f13502f288eb4136b
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index e2f64879e901..6e32082b5470 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -22,12 +22,6 @@
   </maintainer>
 
   <use>
-    <flag name="bayes">
-      Require a database (MySQL, SQLite, Postgres, or BerkDB) backend
-      to enable the Bayesian filtering database. If you use the Redis
-      backend, you do not need to enable this flag (Redis support is
-      enabled automatically, and has no external dependencies).
-    </flag>
     <flag name="cron">
       Install a cron job to update SpamAssassin's rules daily.
     </flag>
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
index bb451f05de08..18438cd92a69 100644
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.4.1-r21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
 
 # The Makefile.PL script checks for dependencies, but only fails if a
diff --git a/mail-filter/spamassassin/spamassassin-3.4.1-r8.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r8.ebuild
deleted file mode 100644
index 1d8c64bca2c8..000000000000
--- a/mail-filter/spamassassin/spamassassin-3.4.1-r8.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions systemd toolchain-funcs
-
-MY_P="Mail-SpamAssassin-${PV//_/-}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="An extensible mail filter which can identify and tag spam"
-HOMEPAGE="http://spamassassin.apache.org/"
-SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+bayes berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test"
-
-# You can do without a database unless you need the Bayes features.
-REQUIRED_USE="bayes? ( || ( berkdb mysql postgres sqlite ) )"
-
-# The Makefile.PL script checks for dependencies, but only fails if a
-# required (i.e. not optional) dependency is missing. We therefore
-# require most of the optional modules only at runtime.
-REQDEPEND="dev-lang/perl
-	dev-perl/HTML-Parser
-	dev-perl/Net-DNS
-	dev-perl/NetAddr-IP
-	virtual/perl-Archive-Tar
-	virtual/perl-Digest-SHA
-	virtual/perl-IO-Zlib
-	virtual/perl-Time-HiRes
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)"
-
-# SpamAssassin doesn't use libwww-perl except as a fallback for when
-# curl/wget are missing, so we depend on one of those instead. Some
-# mirrors use https, so we need those utilities to support SSL.
-#
-# re2c is needed to compile the rules (sa-compile).
-#
-# We still need the old Digest-SHA1 because razor2 has not been ported
-# to Digest-SHA.
-OPTDEPEND="app-crypt/gnupg
-	dev-perl/Digest-SHA1
-	dev-perl/Encode-Detect
-	dev-perl/Geo-IP
-	dev-perl/HTTP-Date
-	dev-perl/Mail-DKIM
-	dev-perl/Mail-SPF
-	dev-perl/Net-Patricia
-	dev-perl/Net-CIDR-Lite
-	dev-util/re2c
-	|| ( net-misc/wget[ssl] net-misc/curl[ssl] )
-	virtual/perl-MIME-Base64
-	virtual/perl-Pod-Parser
-	berkdb? ( virtual/perl-DB_File )
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ldap? ( dev-perl/perl-ldap )
-	mysql? (
-		dev-perl/DBI
-		dev-perl/DBD-mysql
-	)
-	postgres? (
-		dev-perl/DBI
-		dev-perl/DBD-Pg
-	)
-	sqlite? (
-		dev-perl/DBI
-		dev-perl/DBD-SQLite
-	)
-	ssl? ( dev-perl/IO-Socket-SSL )"
-
-DEPEND="${REQDEPEND}
-	test? (
-		${OPTDEPEND}
-		virtual/perl-Test-Harness
-	)"
-RDEPEND="${REQDEPEND} ${OPTDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/spamassassin-3.4.1-bug_7199.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7223.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7231.patch"
-	"${FILESDIR}/spamassassin-3.4.1-bug_7265.patch"
-)
-
-src_prepare() {
-	default
-
-	# The sa_compile test does some weird stuff like hopping around in
-	# the directory tree and calling "make" to create a dist tarball
-	# from ${S}. It fails, and is more trouble than it's worth...
-	perl_rm_files t/sa_compile.t || die 'failed to remove sa_compile test'
-
-	# The spamc tests (which need the networked spamd daemon) fail for
-	# irrelevant reasons. It's too hard to disable them (unlike the
-	# spamd tests themselves -- see src_test), so use a crude
-	# workaround.
-	perl_rm_files t/spamc_*.t || die 'failed to remove spamc tests'
-}
-
-src_configure() {
-	# Set SYSCONFDIR explicitly so we can't get bitten by bug 48205 again
-	# (just to be sure, nobody knows how it could happen in the first place).
-	#
-	# We also set the path to the perl executable explictly. This will be
-	# used to create the initial shebang line in the scripts (bug 62276).
-	perl Makefile.PL \
-		PREFIX="${EPREFIX}/usr" \
-		INSTALLDIRS=vendor \
-		SYSCONFDIR="${EPREFIX}/etc" \
-		DATADIR="${EPREFIX}/usr/share/spamassassin" \
-		PERL_BIN="${EPREFIX}/usr/bin/perl" \
-		ENABLE_SSL="$(usex ssl)" \
-		DESTDIR="${D}" \
-		|| die 'failed to create a Makefile using Makefile.PL'
-
-	# Now configure spamc.
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" spamc/Makefile
-}
-
-src_compile() {
-	PERL_MM_USE_DEFAULT=1 emake
-
-	if use qmail; then
-		emake spamc/qmail-spamc
-	fi
-}
-
-src_install () {
-	emake install
-	einstalldocs
-
-	# Create the stub dir used by sa-update and friends
-	keepdir /var/lib/spamassassin
-
-	# Move spamd to sbin where it belongs.
-	dodir /usr/sbin
-	mv "${ED}"/usr/bin/spamd "${ED}"/usr/sbin/spamd  || die "move spamd failed"
-
-	if use qmail; then
-		dobin spamc/qmail-spamc
-	fi
-
-	ln -s mail/spamassassin "${ED}"/etc/spamassassin || die
-
-	# Disable plugin by default
-	sed -i -e 's/^loadplugin/\#loadplugin/g' \
-		"${ED}/etc/mail/spamassassin/init.pre" \
-		|| die "failed to disable plugins by default"
-
-	# Add the init and config scripts.
-	newinitd "${FILESDIR}/3.4.1-spamd.init" spamd
-	newconfd "${FILESDIR}/3.4.1-spamd.conf" spamd
-
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-
-	# The sed statements in the following conditionals alter the init
-	# script to depend (or not) on the database being running before
-	# spamd is started. The sed commands either enable the dependency,
-	# or delete the line entirely.
-	if use postgres; then
-		sed -i -e 's:@USEPOSTGRES@::' "${ED}/etc/init.d/spamd" || die
-
-		dodoc sql/*_pg.sql
-	else
-		sed -i -e '/@USEPOSTGRES@/d' "${ED}/etc/init.d/spamd" || die
-	fi
-
-	if use mysql; then
-		sed -i -e 's:@USEMYSQL@::' "${ED}/etc/init.d/spamd" || die
-
-		dodoc sql/*_mysql.sql
-	else
-		sed -i -e '/@USEMYSQL@/d' "${ED}/etc/init.d/spamd" || die
-	fi
-
-	dodoc NOTICE TRADEMARK CREDITS UPGRADE USAGE sql/README.bayes \
-		sql/README.awl procmailrc.example sample-nonspam.txt \
-		sample-spam.txt spamd/PROTOCOL spamd/README.vpopmail \
-		spamd-apache2/README.apache
-
-	# Rename some files so that they don't clash with others.
-	newdoc spamd/README README.spamd
-	newdoc sql/README README.sql
-	newdoc ldap/README README.ldap
-
-	if use qmail; then
-		dodoc spamc/README.qmail
-	fi
-
-	insinto /etc/mail/spamassassin/
-	insopts -m0400
-	newins "${FILESDIR}"/secrets.cf secrets.cf.example
-
-	# Create the directory where sa-update stores its GPG key (if you
-	# choose to import one). If this directory does not exist, the
-	# import will fail. This is bug 396307. We expect that the import
-	# will be performed as root, and making the directory accessible
-	# only to root prevents a warning on the command-line.
-	diropts -m0700
-	dodir /etc/mail/spamassassin/sa-update-keys
-
-	if use cron; then
-		# Install the cron job if they want it.
-		exeinto /etc/cron.daily
-		newexe "${FILESDIR}/update-spamassassin-rules.cron" \
-			   update-spamassassin-rules
-	fi
-}
-
-src_test() {
-	# Trick the test suite into skipping the spamd tests. Setting
-	# SPAMD_HOST to a non-localhost value causes SKIP_SPAMD_TESTS to be
-	# set in SATest.pm.
-	export SPAMD_HOST=disabled
-	default
-}
-
-pkg_postinst() {
-	elog
-	elog 'No rules are installed by default. You will need to run sa-update'
-	elog 'at least once, and most likely configure SpamAssassin before it'
-	elog 'will work.'
-
-	if ! use cron; then
-		elog
-		elog 'You should consider a cron job for sa-update. One is provided'
-		elog 'for daily updates if you enable the "cron" USE flag.'
-	fi
-	elog
-	elog 'Configuration and update help can be found on the wiki:'
-	elog
-	elog '  https://wiki.gentoo.org/wiki/SpamAssassin'
-	elog
-}