gentoo Easter resync : 12.04.2020

6 files changed, 2 insertions, 157 deletions

diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 4f7ced34ef3b..54852a2534de 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,11 +1,3 @@
-AUX rss2email-2.69-config-location.patch 433 BLAKE2B 068d30efe9658b51d3327a18adec116e3b2f7601cf8fb6ddda9a5c8e6d2ed8acca390f217f96486ca88ff96e85f24cc441d270260cd14fbb6ccbe63ada3d7dea SHA512 a486c34b58798ec8581164ef593c7320f27233b5e4abfa648389ea54b8c6b7c51f7737baf18150e65537ed198f05293befbf4c1a3abb6c0954a9870ab4985805
-DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
-DIST rss2email-3.10.tar.gz 64230 BLAKE2B 1f41b47c9d48be0c8eff9c4223b1bddcee739566c5414f23abe33c2860c10c34fcab9b149666400897c264ff59fbc692fd4f93963b4084cfa15ae435257fe288 SHA512 655f20bfa01ca6923d6b10c5dbed59706e15ae697f3e5f0be8e963301cd9c6d9c5612b82d38bdf5b2cec3a5c495501fd3e4572da5057430fd1de69317b674160
-DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
-DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
-EBUILD rss2email-2.71-r1.ebuild 1579 BLAKE2B 65ba774e855288a8c949c7e401311d7ce65c905f7bcc3406ed639eb13655811c050f67643635381d72fa0969397bf6cfdc82ea7f0522a3dd81d04afffd3e62b3 SHA512 5eab69777125d94098a8df7b2bb4ab65b885e37743a4ba734cc4008852180f1ca6fe8fdb87e94a0e0497583636560e9777ce29138acc097d9db2dd018a4f775d
-EBUILD rss2email-3.10.ebuild 861 BLAKE2B 9f5d398489d761afa3ad3eca70cf814b8417bf48a3c2787e0cec6a05cad409d1bb7928a9d8e518ce13d59c92b388b3be211f83a33795319dc27af97cd759d21f SHA512 e090b36d7e579feab70de7b48d1db13f153521ff4ccf04a74f1272db2697786ebef3c6387f3ec826d7e18b37653d1f44f58526e16c2e6868d726a6156ccb09a0
-EBUILD rss2email-3.10_pre20171001.ebuild 768 BLAKE2B 3c1871adeab5b81ffd0c862e84f58a85681bb86eb208da9725edfcdf2f501d030b9e9ffc91b9f031cbe2fe164e5f54c96d43644e6a670415a8baa67796c12c09 SHA512 5da642969a30bb5f0a12d8000006bf88a0decceb5305b9319b6aa665d5e92bb3bfc07ba1fdb0dfd28b79b3a8e0cf5716ef854a59c82b970fb8117f70942f1545
-EBUILD rss2email-3.11.ebuild 762 BLAKE2B c0427f9e11d31ab7da584baf51edea43a6b81a745022f464c9b72b71f6634e5cdc374fb3e92752871f40abe2ad20afd670fb236466f8899889edce3e74b6fb2e SHA512 7c80c920ecca994edc610c2e99f37f62a84c5316722324e1a366df7e82f20cd90b64fa5e4dc20d90f33720add4e2955639892a4762add259369c00f8d4585c6a
+EBUILD rss2email-3.11.ebuild 760 BLAKE2B 8eb9255668f8f949cd9f8439d40f2577d11ba6b9d6ac0f476adc445fa2a3fadc0c8f34a9ab21b6112271134c744028aad1b553737252e20cf9e9c0a2708c58f9 SHA512 83212470393f2a2368c22c35bb6acf7283cfec1f6fb81834afafec649fb89db11d3b1db0496b420bc0e1d6eb89a4feae0cde960f9144b1ead6dcec18026fdd2c
 MISC metadata.xml 435 BLAKE2B 92960d2f537c61ec2639907d5d2071d06ef3b29a49a70b8cf69dc3625d358e015cfd6bed1c735713d44c780de43d75082d1df133540ef4da38f996f44bcd31dd SHA512 2b7d4a2bafc039030ae131a0c567a782488a6d5b225fe0b0b62f2ffe9852c2006ce377b5cc05407503dc01ed427a8c8be4853d5c03902708f38841df24c9fcd8
diff --git a/net-mail/rss2email/files/rss2email-2.69-config-location.patch b/net-mail/rss2email/files/rss2email-2.69-config-location.patch
deleted file mode 100644
index 215c1725a9c1..000000000000
--- a/net-mail/rss2email/files/rss2email-2.69-config-location.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- rss2email.py	2010-11-25 02:22:14.607431246 +0100
-+++ rss2email.py	2010-11-25 02:26:54.478306015 +0100
-@@ -254,7 +254,12 @@
- 
- # Read options from config file if present.
- import sys
--sys.path.insert(0,".")
-+import os
-+_conf_dir = os.path.expanduser('~/.rss2email')
-+if not os.path.exists(os.path.join(_conf_dir, 'config.py')):
-+	_conf_dir = '/etc/rss2email'
-+sys.path.insert(0, _conf_dir)
-+
- try:
- 	from config import *
- except:
diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild
deleted file mode 100644
index 215277e290fb..000000000000
--- a/net-mail/rss2email/rss2email-2.71-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-DEBIAN_PV="2.65"
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="http://www.allthingsrss.com/rss2email"
-SRC_URI="http://www.allthingsrss.com/${PN}/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${DEBIAN_PV}-1.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/patchutils"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/feedparser-5.0.1
-	>=dev-python/html2text-3.01"
-
-src_unpack() {
-	# Tarball has zero permissions inside
-	tar xf "${DISTDIR}"/${P}.tar.gz || die
-	chmod 0755 ${P} || die
-	chmod 0644 ${P}/* || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.69-config-location.patch
-
-	# Extract man page from Debian patch
-	zcat "${DISTDIR}"/${PN}_${DEBIAN_PV}-1.diff.gz \
-		| filterdiff -i '*/r2e.1' \
-		> "${S}"/r2e.1.patch || die
-	EPATCH_OPTS="-p1" epatch r2e.1.patch
-}
-
-src_install() {
-	my_install() {
-		python_moduleinto ${PN}
-		python_newscript rss2email.py main.py
-	}
-	python_foreach_impl my_install
-
-	insinto /etc/${PN}
-	doins config.py.example
-
-	dodoc CHANGELOG readme.html
-	doman r2e.1
-
-	# Replace r2e wrapper
-	cat <<-"EOF" >r2e
-		#! /bin/sh
-		SITE_PACKAGES=`python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
-		CONF_DIR=${HOME}/.rss2email
-		mkdir -p "${CONF_DIR}"
-		exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $*
-	EOF
-
-	dobin r2e
-}
diff --git a/net-mail/rss2email/rss2email-3.10.ebuild b/net-mail/rss2email/rss2email-3.10.ebuild
deleted file mode 100644
index cf9d0319a4a4..000000000000
--- a/net-mail/rss2email/rss2email-3.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Support for 3.4 and 3.5 is broken upstream, see https://github.com/rss2email/rss2email/issues/80
-# Support for 3.7 needs support from dependencies, first
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-python/feedparser-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
deleted file mode 100644
index 41b8679f838f..000000000000
--- a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DEBIAN_PV=${PV/_*/}-4
-
-MY_COMMIT=e21e803a158a90ed784ee61ce7226e5c3a593a28
-DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
-HOMEPAGE="https://github.com/rss2email/rss2email"
-SRC_URI="https://github.com/rss2email/rss2email/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-util/patchutils"
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/feedparser-5.0.1
-	>=dev-python/html2text-3.01"
-
-S="${WORKDIR}"/${PN}-${MY_COMMIT}
-
-src_install() {
-	distutils-r1_src_install
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-3.11.ebuild b/net-mail/rss2email/rss2email-3.11.ebuild
index 7e93a36497d8..b83884e5de4a 100644
--- a/net-mail/rss2email/rss2email-3.11.ebuild
+++ b/net-mail/rss2email/rss2email-3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"