From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1041077-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A885C138334
for <garchives@archives.gentoo.org>; Thu, 9 Aug 2018 06:06:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DD471E092B;
Thu, 9 Aug 2018 06:05:22 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0F9AFE0937
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Aug 2018 06:05:16 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 2FCC5335DAC
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Aug 2018 00:24:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 03136385
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Aug 2018 00:24:35 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1533774258.0b9826709747b0b137d50c4c5e245bbdd38db585.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/spamassassin/
X-VCS-Repository: repo/gentoo
X-VCS-Files: mail-filter/spamassassin/metadata.xml mail-filter/spamassassin/spamassassin-3.4.1-r8.ebuild
X-VCS-Directories: mail-filter/spamassassin/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 0b9826709747b0b137d50c4c5e245bbdd38db585
X-VCS-Branch: master
Date: Thu, 9 Aug 2018 00:24:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3f61bab2-4283-4216-b27e-9c5328ce97ae
X-Archives-Hash: 2cc21bee5f82875419ba74ce38c7aa56
commit: 0b9826709747b0b137d50c4c5e245bbdd38db585
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 9 00:24:18 2018 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Aug 9 00:24:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b982670
mail-filter/spamassassin: remove "unused" spamassassin-3.4.1-r8.ebuild.
Package-Manager: Portage-2.3.44, Repoman-2.3.9
mail-filter/spamassassin/metadata.xml | 6 -
.../spamassassin/spamassassin-3.4.1-r8.ebuild | 240 ---------------------
2 files changed, 246 deletions(-)
diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index e2f64879e90..6e32082b547 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-r8.ebuild b/mail-filter/spamassassin/spamassassin-3.4.1-r8.ebuild
deleted file mode 100644
index 1d8c64bca2c..00000000000
--- 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
-}