7 files changed, 8 insertions, 253 deletions
diff --git a/net-mail/rss2email/ChangeLog b/net-mail/rss2email/ChangeLog
index d6320f6e9112..563db48fe640 100644
--- a/net-mail/rss2email/ChangeLog
+++ b/net-mail/rss2email/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/rss2email
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/ChangeLog,v 1.12 2011/05/24 20:59:25 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/ChangeLog,v 1.13 2014/10/15 17:30:09 radhermit Exp $
+
+  15 Oct 2014; Tim Harder <radhermit@gentoo.org> -rss2email-2.65.ebuild,
+  -rss2email-2.69.ebuild, -rss2email-2.69-r1.ebuild, -rss2email-2.70.ebuild,
+  -files/rss2email-2.65-X-rss-feed.patch,
+  -files/rss2email-2.65-r2e-chmod.patch:
+  Remove old.
 
   24 May 2011; Markus Meier <maekke@gentoo.org> rss2email-2.71.ebuild:
   x86 stable, bug #365465
diff --git a/net-mail/rss2email/files/rss2email-2.65-X-rss-feed.patch b/net-mail/rss2email/files/rss2email-2.65-X-rss-feed.patch
deleted file mode 100644
index be394dcb90f1..000000000000
--- a/net-mail/rss2email/files/rss2email-2.65-X-rss-feed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rss2email.py~	2009-04-25 00:29:16.000000000 +0200
-+++ rss2email.py	2009-07-26 15:39:16.787467661 +0200
-@@ -619,7 +619,7 @@
- 					subjecthdr = title
- 					datehdr = time.strftime("%a, %d %b %Y %H:%M:%S -0000", datetime)
- 					useragenthdr = "rss2email"
--					extraheaders = {'Date': datehdr, 'User-Agent': useragenthdr}
-+					extraheaders = {'Date': datehdr, 'User-Agent': useragenthdr, 'X-rss-feed': f.url}
- 					if BONUS_HEADER != '':
- 						for hdr in BONUS_HEADER.strip().splitlines():
- 							pos = hdr.strip().find(':')
diff --git a/net-mail/rss2email/files/rss2email-2.65-r2e-chmod.patch b/net-mail/rss2email/files/rss2email-2.65-r2e-chmod.patch
deleted file mode 100644
index 012ad305f9e3..000000000000
--- a/net-mail/rss2email/files/rss2email-2.65-r2e-chmod.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rss2email/r2e
-===================================================================
---- rss2email.orig/r2e
-+++ rss2email/r2e
-@@ -10,7 +10,7 @@ if [ "$1" = "-d" ]; then
- 	shift 2
- fi
- if [ ! -d "$dir" ]; then
--	mkdir -p "$dir"
-+	mkdir -p -m 700 "$dir"
- fi
- cd "$dir"
- exec python /usr/share/rss2email/rss2email.py feeds.dat $*
diff --git a/net-mail/rss2email/rss2email-2.65.ebuild b/net-mail/rss2email/rss2email-2.65.ebuild
deleted file mode 100644
index 494a4d076cf9..000000000000
--- a/net-mail/rss2email/rss2email-2.65.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/rss2email-2.65.ebuild,v 1.4 2011/04/05 05:50:28 ulm Exp $
-
-EAPI=2
-
-inherit eutils
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="A python script that converts RSS newsfeeds to email"
-HOMEPAGE="http://www.allthingsrss.com/rss2email"
-SRC_URI="mirror://debian/pool/main/r/rss2email/rss2email_${PV}.orig.tar.gz
-	mirror://debian/pool/main/r/rss2email/rss2email_${PV}-1.diff.gz"
-# debian has a packaged archive that we use instead of:
-# http://rss2email.infogami.com/${P}.py
-# http://www.aaronsw.com/2002/html2text/html2text-2.35.py
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-python/feedparser
-	dev-lang/python"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${WORKDIR}"/rss2email_${PV}-1.diff
-
-	epatch "${FILESDIR}"/${P}-r2e-chmod.patch
-	epatch "${FILESDIR}"/${P}-X-rss-feed.patch
-}
-
-src_install() {
-	insinto /usr/share/rss2email
-	doins rss2email.py html2text.py config.py
-
-	exeinto /usr/bin
-	doexe r2e
-
-	doman r2e.1
-}
diff --git a/net-mail/rss2email/rss2email-2.69-r1.ebuild b/net-mail/rss2email/rss2email-2.69-r1.ebuild
deleted file mode 100644
index 039dcd925514..000000000000
--- a/net-mail/rss2email/rss2email-2.69-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/rss2email-2.69-r1.ebuild,v 1.2 2010/12/18 03:25:14 sping Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python
-
-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=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="dev-python/feedparser
-	dev-python/html2text"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-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() {
-		insinto "$(python_get_sitedir)"/${PN}
-		newins rss2email.py main.py || die
-
-		insinto /etc/${PN}
-		doins config.py || die
-	}
-	python_execute_function my_install
-
-	dodoc CHANGELOG readme.html || die
-	doman r2e.1 || die
-
-	# 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 || die
-}
diff --git a/net-mail/rss2email/rss2email-2.69.ebuild b/net-mail/rss2email/rss2email-2.69.ebuild
deleted file mode 100644
index 85faeea283ff..000000000000
--- a/net-mail/rss2email/rss2email-2.69.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/rss2email-2.69.ebuild,v 1.3 2010/12/18 03:25:14 sping Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python
-
-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=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="dev-python/feedparser
-	dev-python/html2text"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-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() {
-		insinto "$(python_get_sitedir)"/${PN}
-		newins rss2email.py main.py || die
-
-		insinto /etc/${PN}
-		doins config.py || die
-	}
-	python_execute_function my_install
-
-	dodoc CHANGELOG readme.html || die
-	doman r2e.1 || die
-
-	# Replace r2e wrapper
-	cat <<-"EOF" >r2e
-		#! /bin/sh
-		SITE_PACKAGES=`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
-		CONF_DIR=${HOME}/.rss2email
-		mkdir -p "${CONF_DIR}"
-		exec python "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $*
-	EOF
-
-	dobin r2e || die
-}
diff --git a/net-mail/rss2email/rss2email-2.70.ebuild b/net-mail/rss2email/rss2email-2.70.ebuild
deleted file mode 100644
index e47cd9251dcf..000000000000
--- a/net-mail/rss2email/rss2email-2.70.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/rss2email/rss2email-2.70.ebuild,v 1.1 2010/12/25 02:28:13 sping Exp $
-
-EAPI="2"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils python
-
-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=""
-
-DEPEND="dev-util/patchutils"
-RDEPEND="dev-python/feedparser
-	dev-python/html2text"
-
-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() {
-		insinto "$(python_get_sitedir)"/${PN}
-		newins rss2email.py main.py || die
-	}
-	python_execute_function my_install
-
-	insinto /etc/${PN}
-	doins config.py.example || die
-
-	dodoc CHANGELOG readme.html || die
-	doman r2e.1 || die
-
-	# 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 || die
-}