gentoo resync : 16.02.1018

3 files changed, 3 insertions, 58 deletions

diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index 47546b4482a2..749f78ba0c2b 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,5 +1,4 @@
 AUX popfile 715 BLAKE2B 071dd14e37401ab0c5c25d644f55275fbf59bd9dba5bca39202f27338492603a95c023fe1288c507f76f78d4c0137580d8a279c4738247f8b507b3090318a313 SHA512 a802f753de335552a0b54da98baaad07ceda1da83f0c082d4e2204c90378c35ca5f34bfee1f7beaf11ee6795b7287dcf3db07eedf958665134064dfd9168fae2
 DIST popfile-1.1.3.zip 523431 BLAKE2B cf084e572bf0d8da7d4ce4435f7df9c527ebb0d6714f9b5ac2c2d8701231f452989de048e24bdd7cec2483466ed20f1ed9aa84255f7606a9ffb2bb06bf05b30c SHA512 0e3ed3d67d2c2b456643335dd030a51e890bb371c5b8cf9eed9fac350a2536b8884eeffff78fcb27b99c39711505df533ee3ded5b40714fb46e54c2d25b3dda9
-EBUILD popfile-1.1.3-r1.ebuild 1121 BLAKE2B 591b689643bab0fb5c4b192732eb4ad2221b14577862fecb63f18331417feda567d0fd16bcff279338cc2cd36852748ead54062788af676c684c0dbcdea36c36 SHA512 72ed23bb8be7e51b20baf540fa4fce83d611966de7c1dd528edef72087a8ca4e729c79caa7e87f4dece3567912a4d4d38e057708bc854b402956c03ddb3bdfd1
-EBUILD popfile-1.1.3.ebuild 1058 BLAKE2B 1713631777762f13a14d5b75cab280044951f2d910fba8803458f3095125994f888ac15bcfa73a62b9d1cae982500a3f5431e536575e590b5ee1295c9711f588 SHA512 f6055e02d18329e3113e4eb56351d7ab78dd2fe09be5345b465e0e561edc84eaa35755c259108ed71428ee2e90023739f5086ae9ad88bb8e28f220f58f939555
+EBUILD popfile-1.1.3-r1.ebuild 1116 BLAKE2B 30091aba8457667ec6e6b768c440eceb74f0c5f5c08df2c4c9a964d391ee53bd3d0807e4d07df4422ef5c624447989d5b8d1a93917fc63e560f568a6fe72d0d7 SHA512 7230d404a69480fcf56a227fe101e38b8f9eaa03b48b66759977608d0bd7674b9f28776475c7de8da623cb0c23cee0acc18d575669d71659b21c09835484f123
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
index bafb8245f838..45ab09e88418 100644
--- a/mail-filter/popfile/popfile-1.1.3-r1.ebuild
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://getpopfile.org/downloads/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cjk ipv6 libressl mysql ssl xmlrpc"
 
 RDEPEND="virtual/perl-Digest-MD5
diff --git a/mail-filter/popfile/popfile-1.1.3.ebuild b/mail-filter/popfile/popfile-1.1.3.ebuild
deleted file mode 100644
index 21e54839f75d..000000000000
--- a/mail-filter/popfile/popfile-1.1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Anti-spam bayesian filter"
-HOMEPAGE="http://getpopfile.org"
-SRC_URI="http://getpopfile.org/downloads/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cjk ipv6 mysql ssl xmlrpc"
-
-RDEPEND="virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64
-	dev-perl/DBD-SQLite
-	dev-perl/HTML-Tagset
-	dev-perl/HTML-Template
-	dev-perl/TimeDate
-	dev-perl/DBI
-	virtual/perl-Digest
-	cjk? ( dev-perl/Encode-compat
-		dev-perl/Text-Kakasi )
-	mysql? ( dev-perl/DBD-mysql	)
-	ipv6? ( dev-perl/IO-Socket-INET6 )
-	ssl? ( dev-libs/openssl:0
-		dev-perl/IO-Socket-SSL
-		dev-perl/Net-SSLeay )
-	xmlrpc? ( dev-perl/PlRPC )"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local f
-	for f in `find ./ -type f`; do
-		edos2unix "${f}"
-	done
-}
-
-src_install() {
-	dodoc *.change*
-	rm -rf *.change* license
-
-	insinto /usr/share/${PN}
-	doins -r *
-
-	fperms 755 /usr/share/${PN}/{popfile,insert,pipe,bayes}.pl
-
-	dosbin "${FILESDIR}"/${PN}
-}