gentoo resync : 29.08.2018

9 files changed, 228 insertions, 15 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 09452bc593cb..2de6e58cd2c6 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 3daaa2f19404..3c9e5324753c 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -14,9 +14,11 @@ DIST cyrus-imapd-2.5.11.tar.gz 3109188 BLAKE2B 9382d8e4b9317f7fa12f63f7262eb0c6a
 DIST cyrus-imapd-3.0.4.tar.gz 10819487 BLAKE2B 209e379731c996ee083b0de61d6122b3756d1f6880071ebf015157057cf45845961d762ee762ae56213f72f15c01df29ab2d2661c4e352c6b4a680924d15d7b0 SHA512 9ceb7ac837c932c70fa0c1583bf8700b3ec27568d72538ae8d59f2f551e3007b3c2fc68fd29c009597c3949345dbe1bf2eb614bea038d70a5b49e5507df6b69a
 DIST cyrus-imapd-3.0.5.tar.gz 10910080 BLAKE2B a7914ab189a290427ddc0d013c19ff0c36f3a6c4fc016f50013d0f6abb11ae2f7d067b71df99b7f00ba4e8a2170e0f068baa170458b0dc1e94d69d8e4b814873 SHA512 262806729d5ee5d753732603aa7af33c6f96bc5145b7a951b8668ffdee0dcd4a90bd287da0949e85c4596cccb471a688f7f8b6f3e39194e1cff311950d4d4410
 DIST cyrus-imapd-3.0.6.tar.gz 10734548 BLAKE2B d16d1093b17f632fa75e77c1b923deb0c5a76de4c06a657c4c1dd2f9498ac0abd81ecee58c64378118d4b09be872957afc6db5d8deebf72c819623d6ea5aa0a9 SHA512 375e3936465e9ee448996cf738ebe93a35697a58a7784cf6f7a8be25e3e03925fb4f44ff98a0aacbc5b9e3ef39fc8a0e51acb4ea26cbbfbc8e492556fdc03a03
+DIST cyrus-imapd-3.0.8.tar.gz 10735462 BLAKE2B 27fdead9a75048c12fe4c0eed1dcda9ce24319c2183851190068fd3ded32c1f6b4d550e726dd4a483bafe298ac0199aa2b1354c6f0c5ac0083d7d1ad0e69457a SHA512 f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960
 EBUILD cyrus-imapd-2.5.10.ebuild 4676 BLAKE2B 4e3960ade8b08e85a9beec894dd11bd144b218ca665fb4ddd762db8e881dbaa8a1f814fdf8e811e7d54e5d4f6456d601898f2fd1b7065be6edfa6c38dd83b965 SHA512 80bd9c18c80d5408862f4ad20b4f0f82c21b3a11f5ef54e504cdea454e0a7fde5f0cd8ffbf455665b0a907eadc243c45d5ccae9a08dde5faca7ff2f9cddb1ceb
 EBUILD cyrus-imapd-2.5.11-r1.ebuild 4772 BLAKE2B 72c2a8d1927728dfb638eac22ed3ecff4651dcee12250e169683dc910c8132320ec23b09408eace65799be99629c529a37298f5cb51d91817fa7c44899d02fac SHA512 c14ac12b41bb9594b7686ff6f1fe44e9af160f8eed4cfa7e1c94d1c5098fb55ec160b7b6bfe30bfca494278d18bfd3c9c37a8ed3991e02889512d43f9dd4ceb1
 EBUILD cyrus-imapd-3.0.4.ebuild 5896 BLAKE2B 933086d8d6d45ec33a5a82a0a4a90b1c83848a9d59e39d2027da4ea52a28e9302040e39f61a28ef6112d012cd7bd4b9934506993cb2b8d6a1de75a15a59828d0 SHA512 e0ebe34958c93003798a045c64287dda83d97d1d829889f4601446567ac2f0334a03acd554f0cacdd86b90fbf167f13c020e5b3edbdf78f3d9f9a9d871ea140f
 EBUILD cyrus-imapd-3.0.5.ebuild 5944 BLAKE2B 43fa76c0bda73b8e67440692b3f5586c6bd4435a852c90c63b986db724eca95c12056182e6f52bbdab827aea004e75257a6bf7ff5b0d1ae66d54a865c5b22d5b SHA512 2e9f38bb940bf33982b5879e39106e195dadc47c75772951cfc077873c40d38bcbf479c42ab915b620c1d442d454fc8314f10a98400464f11d2798ced74fa536
 EBUILD cyrus-imapd-3.0.6.ebuild 5946 BLAKE2B 39e6abd36bcc447a79b6b6e34f051090237ee96996f00980e3f1ebf70fa66b1791ac2ad3ed42f1038ffcbf32a650b3d9e29b3d19e5aede7c960ce11d23377a7f SHA512 66fd355b5c1f3f1b99f96829de8f5d670edaaa0cc4129a8a08d8b30509b86104456fcb912f1a444bba2132d0724530b7978d1d9dab220a5cdfc906506583c8e1
+EBUILD cyrus-imapd-3.0.8.ebuild 5813 BLAKE2B 99d2e5f29d0c4605466059dc17d6c62a1d160c13dfee6ffd3cdcca7a4646d63400cc744f20aebcb192cd5dd1838b59a958064083eb06e098a1ef5962df096d22 SHA512 4f6a152e17d705ced3299d4d7a4c8ad4b2a3b78db149db922523f79c21afce46523c455e4beffbf6e1b1365a6cd6c6e02f6f650662b8671f1f2eab61ca5195f5
 MISC metadata.xml 871 BLAKE2B 4fe48aebf6e59d75cf53cafc92d5bf4668c4a489dba3a43d6df6c4efaeb74590c49f083e03ee9d5eed32ee09b324d8116bcb0fc77576f8aa77a96c56a739dfae SHA512 25449c1218dfad7b692b37b799a659b6a10e0e31bb003fbed27b3b43ce3610f9ee5f17a995cf9244d5027ad84889a8e79a774f63101bb6ea35054ce9dbb1fe20
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
new file mode 100644
index 000000000000..610dbc059bc9
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.8.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic pam ssl-cert user
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sphinx sqlite ssl static-libs tcpd test xapian"
+
+# virtual/mysql-5.5 added for the --variable= option below
+CDEPEND="sys-libs/zlib
+	dev-libs/libpcre
+	>=dev-libs/cyrus-sasl-2.1.13
+	dev-libs/jansson
+	dev-libs/icu:=
+	sys-libs/e2fsprogs-libs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? ( dev-libs/libxml2 dev-libs/libical )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb )
+	mysql? ( >=virtual/mysql-5.5 )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+			virtual/pam
+			>=net-mail/mailbase-1
+		)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 )
+	ssl? ( >=dev-libs/openssl-1.0.1e:0[-bindist] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) )
+	xapian? ( >=dev-libs/xapian-1.4.0 )"
+
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )"
+
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${CDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!net-mail/cyrus-imap-admin
+	!app-arch/dump"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )
+	sphinx? ( mysql )"
+
+pkg_setup() {
+	enewuser cyrus -1 -1 /usr/cyrus mail
+	append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable sphinx) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	rm -f doc/text/Makefile*
+
+	mv "${D}"usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${D}usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
+	newins "${D}usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf" imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${D}"etc/imapd.conf
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${D}"etc/cyrus.conf
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${D}/etc/cyrus.conf" || die
+	fi
+
+	newinitd "${FILESDIR}/cyrus.rc8" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	echo
+	einfo "Please see http://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+	echo
+}
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 54e24a39c6ac..457b12172652 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -6,6 +6,6 @@ AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a4930
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.3.26.tar.xz 1283816 BLAKE2B dd98d7470b8cb65de90cb1d798a2ed3e6aa723bc8e47bcd4d79ca489bdc439fd7204ffb11fea671e292c06616e5a0ccfd9f2689a4f21a1bbbd70677b0f04133e SHA512 8e0a2484e60eaf6c0231e2599e10fec6d207fa1c0fa02ec99b3ef9aea00b6d87275434e79470a25f06e358cdd4a293f9c46a82dd128fe733a99c85144e6caa63
-EBUILD fetchmail-6.3.26-r2.ebuild 2462 BLAKE2B 8ad0de2e78754b93eb87bba94cc93605c4d9764cb5463ca064b18e9c85cf2357d2e2778f49d5fb998096d2128cb4e94de0a4225f35aa9e2b437e7472d067d3d9 SHA512 2c1e61eff77d6f852686e29bdf80141ff416a8c875b53e47e383c40bcbe3a6cb0ffc2fa32ee12410aeb0ff2a13f7d100606675bd2eb240fcb71ccefd88f1ee5d
-EBUILD fetchmail-6.3.26-r3.ebuild 2529 BLAKE2B 02287eef5e6419ec40686614e2cdf191970afd46c348b3d95c2105b9eabb8fdf3e7d43ad2c637ebf4a1ec24e21637a1e9eed0d8f50c5aa2cab36e4c56bedac74 SHA512 701fd1fca24e49fa5be8387f125b2ba472e5856d89851b69d2dce3680a050d830fc211d7482ddca79d418a8c27ebb2f173f8a55b5aaaa083a1c2580f87fa7cae
-MISC metadata.xml 570 BLAKE2B cb438fc220214a9aabeb25e6e2df40b9bf394e9470d9d7862118895dc06ad43160958897ad0200247ffd163abb680e56bdd64d2d10991f3dcb96b360c47d4a1f SHA512 446f71d0bfbfc84d52d8f99ad13574976366edebcf38d14573056ab093cfe5406a6198e980430319e681d86dd33e9d96a390b744cd31b345681334232b8e949e
+EBUILD fetchmail-6.3.26-r2.ebuild 2425 BLAKE2B 2494f8f8812c20bc39e158a40609e0095faae93b5b61ff2ffacbf09526243de134561364e17feab75d73ed4659b17a94b568b3048f7bf0a0ed4881e7b8823c93 SHA512 ce5b7f534479e4d10950bd86d8373f3cd0e3fb5429820f642ea17b1cefb9d954406560c3931f087c72f53925fef7f993e22e84366585117ff2932dcced7a1fb3
+EBUILD fetchmail-6.3.26-r3.ebuild 2492 BLAKE2B a3b72604373b946de64b233015db0cd1759fb7ff1fb395e83be755bde4fce0a591130f9d8bc2f66b88c6e06cda974585135b65a4225538b28d482dfe6c3cf56e SHA512 5fb98711761c9a2a7b720a3f46ba3b66d3a8371ec8229f5defa81d660a7984682a7e5beca026576fa507c14003ccbfecf613042b606cdeaaf7feafd01c48ddc5
+MISC metadata.xml 513 BLAKE2B 3a01d489154b5c2785b4a389788b7800be3b2ad986b2968174d6e7eb548d8483ff00889f306f3ff0bdbe58da947cc1f720783a96264e49579c7d5921cdb7f7aa SHA512 4ce4ca4fa4608213837f8fc1d67f9611247bdab8954afcfd4050292a8f1bfca3b6eb05e3ff85e5c0b217a4d3f7682690322537f03f29272b1f0d477d8093b6aa
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
index 3ba19eb6b659..03a7c8379d11 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r2.ebuild
@@ -14,11 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos hesiod tk socks"
+IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
 	nls? ( virtual/libintl )
 	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
@@ -59,7 +58,7 @@ src_configure() {
 		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
 		$(use_with kerberos gssapi) \
 		$(use_with kerberos kerberos5) \
-		$(use_with hesiod) \
+		--without-hesiod \
 		$(use_with socks)
 }
 
diff --git a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
index eae9513c0d11..f5210c26d371 100644
--- a/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.3.26-r3.ebuild
@@ -14,11 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="ssl nls kerberos hesiod tk socks"
+IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="hesiod? ( net-dns/hesiod )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 )
 	nls? ( virtual/libintl )
 	!elibc_glibc? ( sys-libs/e2fsprogs-libs )
@@ -59,7 +58,7 @@ src_configure() {
 		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
 		$(use_with kerberos gssapi) \
 		$(use_with kerberos kerberos5) \
-		$(use_with hesiod) \
+		--without-hesiod \
 		$(use_with socks)
 }
 
diff --git a/net-mail/fetchmail/metadata.xml b/net-mail/fetchmail/metadata.xml
index f94033e0aa90..33e5a03d1019 100644
--- a/net-mail/fetchmail/metadata.xml
+++ b/net-mail/fetchmail/metadata.xml
@@ -6,7 +6,6 @@
     <name>Net-Mail</name>
   </maintainer>
   <use>
-    <flag name="hesiod">Enable support for hesiod</flag>
     <flag name="tk">Enable support for Tk GUI toolkit, in particular it installs fetchmailconf</flag>
     <flag name="socks">Enable support for socks proxy</flag>
   </use>
diff --git a/net-mail/spamcup/Manifest b/net-mail/spamcup/Manifest
index e20cf21a5dbc..07c7180577e2 100644
--- a/net-mail/spamcup/Manifest
+++ b/net-mail/spamcup/Manifest
@@ -1,3 +1,3 @@
 DIST spamcup-1.09.tar.gz 6801 BLAKE2B c19c1904d6c2f8f0c7b66ba6fd28a9591ecf95470dcfedbeb7e96376498c66e994ad44fdb407b076243d1efa5ee4c50cdf821f8888f269d6c9ed8d8da4d12f51 SHA512 a43a194b7f90fd4ca9a444cba0d42b7a87284842fa2bba6bbd5e2bc2bf8e5aed17de5ba6fbfd7c439fcd40fd0f9233d989ba7abf4d907d857f9c72f2c3bb0504
-EBUILD spamcup-1.09.ebuild 647 BLAKE2B 05ef2b086376905e046538513507900a6547c0de2964aa991122e5dade75225f9db58775d1123bf7248dcb1cad130b8f1689583debb5577e25816c0c47240af4 SHA512 1363cce9a5526cb9d2a4de81df70cbd294b413e2b62861bba2e887df1d274bf6d007b8f2ffc7c1a20548d5318fc333f54142269b33d5b4e22387501c2a9c817f
+EBUILD spamcup-1.09.ebuild 611 BLAKE2B 1eb2a73698e33f5ddf30894f4d92567fdee5f02021df52ccd907a3b7e18404d4ff562832c88d7f5f569bf7d160b9c32a31206cd467d107076e1adf7ecdf85900 SHA512 6792473a6daa49cf5fe248ae5383f78677c19c544e95fbc648865572f355bf85b415c0b8a696d65364ca1d0ffe59907b485f1169b27611dbeff149fb0edebe50
 MISC metadata.xml 321 BLAKE2B 18376f41d644de68af978b85a4649a97a1fd7ea4ed5b9d3f492da609e024ea50b3aa0a63880196c6c931f4a1e3ebfc7232afbbe4a712a49f101342a2a5a66755 SHA512 82f1683bc6b0f509b1ba46c5c57a07dde0ce0d64a1e657861bd1849599cb2a538ba123bc6b61c8ba6d1f425921944d30c0f0a3f31506d59d80a1cecc2d431662
diff --git a/net-mail/spamcup/spamcup-1.09.ebuild b/net-mail/spamcup/spamcup-1.09.ebuild
index 686d285a68fe..051d61595daf 100644
--- a/net-mail/spamcup/spamcup-1.09.ebuild
+++ b/net-mail/spamcup/spamcup-1.09.ebuild
@@ -14,8 +14,8 @@ IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0
 	dev-perl/Getopt-ArgvFile
-	|| ( ( >dev-perl/libwww-perl-6 dev-perl/HTML-Form ) <dev-perl/libwww-perl-6
-	) "
+	dev-perl/HTML-Form
+	>dev-perl/libwww-perl-6"
 RDEPEND="${DEPEND}"
 
 src_install() {