public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-mail/rss2email/, net-mail/rss2email/files/
@ 2020-03-30 12:27 Mikle Kolyada
  0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada @ 2020-03-30 12:27 UTC (permalink / raw
  To: gentoo-commits

commit:     049de9f25d69da4a1be59d68dafe6409f47a26e9
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 12:26:46 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 12:26:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049de9f2

net-mail/rss2email: Drop old (py2-only)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-mail/rss2email/Manifest                        |  2 -
 .../files/rss2email-2.69-config-location.patch     | 16 -----
 net-mail/rss2email/rss2email-2.71-r2.ebuild        | 68 ----------------------
 3 files changed, 86 deletions(-)

diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 3f2f76023c4..fe4ad53ee4a 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,3 +1 @@
-DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
 DIST rss2email-3.11.tar.gz 66441 BLAKE2B 24be7c4d280e337869833f9fa492186a9f4cc208e9f6152c1d4012edb016993a37cddd991d6211888d6aa7654d66bc79d9d70f1508dae20fa39d79fffeeef55b SHA512 2efdef703a4b4774d85926f500a37689aea3a324f63a13a686a2322c9f69ac7b940c5b953f417d9259e1493b3dafde4c2e1ddb3433d085fb2400cd06001141bb
-DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d

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 215c1725a9c..00000000000
--- 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-r2.ebuild b/net-mail/rss2email/rss2email-2.71-r2.ebuild
deleted file mode 100644
index 351a6d6351e..00000000000
--- a/net-mail/rss2email/rss2email-2.71-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 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-2019.8.11"
-
-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
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/rss2email/, net-mail/rss2email/files/
@ 2024-03-08 23:20 Sebastian Pipping
  0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Pipping @ 2024-03-08 23:20 UTC (permalink / raw
  To: gentoo-commits

commit:     62907307016fa059bc999da22a7f4797c84f08e7
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  8 23:19:35 2024 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar  8 23:19:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62907307

net-mail/rss2email: Fix tests for >=dev-python/html2text-2024.2.25

Closes: https://bugs.gentoo.org/926133
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 .../rss2email/files/rss2email-3.14-tests.patch     | 24 ++++++++++++++
 net-mail/rss2email/rss2email-3.14-r2.ebuild        | 38 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/net-mail/rss2email/files/rss2email-3.14-tests.patch b/net-mail/rss2email/files/rss2email-3.14-tests.patch
new file mode 100644
index 000000000000..b797f9d00d94
--- /dev/null
+++ b/net-mail/rss2email/files/rss2email-3.14-tests.patch
@@ -0,0 +1,24 @@
+From b5c0e78006c2db6929b5ff50e8529de58a00412a Mon Sep 17 00:00:00 2001
+From: auouymous <au@qzx.com>
+Date: Fri, 8 Mar 2024 15:50:04 -0700
+Subject: [PATCH] Replace a "c2 a0" utf-8 sequence in test feed with a space.
+
+This caused html2text >=2024.2.25 to produce a double space and break
+the tests.
+---
+ test/data/allthingsrss/feed.atom | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/data/allthingsrss/feed.atom b/test/data/allthingsrss/feed.atom
+index 074847b..0cf8c33 100644
+--- a/test/data/allthingsrss/feed.atom
++++ b/test/data/allthingsrss/feed.atom
+@@ -47,7 +47,7 @@
+ &lt;/ul&gt;
+ &lt;p&gt;Complete list in the official &lt;a href="http://www.allthingsrss.com/rss2email/changelog"&gt;CHANGELOG&lt;/a&gt;.&lt;/p&gt;
+ &lt;p&gt;&lt;strong&gt;Pause/Unpause&lt;/strong&gt;&lt;/p&gt;
+-&lt;p&gt;Through &lt;code&gt;r2e pause &lt;em&gt;n&lt;/em&gt;&lt;/code&gt; where &lt;em&gt;n&lt;/em&gt; is a feed number, you can temporarily suspend checking that feed for new content. To start checking it again, simply run &lt;code&gt;r2e unpause &lt;em&gt;n&lt;/em&gt;&lt;/code&gt;. When you &lt;code&gt;r2e list&lt;/code&gt;, an asterisk indicates that the feed is currently unpaused and active.&lt;/p&gt;
++&lt;p&gt;Through &lt;code&gt;r2e pause &lt;em&gt;n&lt;/em&gt;&lt;/code&gt; where &lt;em&gt;n&lt;/em&gt; is a feed number, you can temporarily suspend checking that feed for new content. To start checking it again, simply run &lt;code&gt;r2e unpause &lt;em&gt;n&lt;/em&gt;&lt;/code&gt;. When you &lt;code&gt;r2e list&lt;/code&gt;, an asterisk indicates that the feed is currently unpaused and active.&lt;/p&gt;
+ 
+ &lt;p&gt;&lt;a href="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/0/da"&gt;&lt;img src="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/0/di" border="0" ismap="true"&gt;&lt;/img&gt;&lt;/a&gt;&lt;br/&gt;
+ &lt;a href="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/1/da"&gt;&lt;img src="http://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/1/di" border="0" ismap="true"&gt;&lt;/img&gt;&lt;/a&gt;&lt;/p&gt;&lt;img src="http://feeds.feedburner.com/~r/allthingsrss/hJBr/~4/bT-I0iH2vw8" height="1" width="1"/&gt;</content>

diff --git a/net-mail/rss2email/rss2email-3.14-r2.ebuild b/net-mail/rss2email/rss2email-3.14-r2.ebuild
new file mode 100644
index 000000000000..1f055a148d50
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.14-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..12} )
+
+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 ~ppc64 ~x86"
+
+RDEPEND=">=dev-python/feedparser-6.0.5[${PYTHON_USEDEP}]
+	>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-tests.patch
+)
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
+
+python_test() {
+	cd test/ || die  # or the tests won't find their data
+	distutils-r1_python_test
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-03-08 23:20 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-30 12:27 [gentoo-commits] repo/gentoo:master commit in: net-mail/rss2email/, net-mail/rss2email/files/ Mikle Kolyada
  -- strict thread matches above, loose matches on Subject: below --
2024-03-08 23:20 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox