commit: 229fae0ad783237854ea704d6804d96e3d2f612c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Jul 13 04:48:39 2020 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 13 04:48:39 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229fae0a
net-misc/pytvshows: Remove last-rited pkg Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-misc/pytvshows/Manifest | 1 - .../pytvshows/files/pytvshows-0.2-ezrss.it.patch | 30 --- .../pytvshows/files/pytvshows-0.2-feedurl.patch | 279 --------------------- .../files/pytvshows-0.2-improved-re.patch | 15 -- .../pytvshows/files/pytvshows-0.2-rename-var.patch | 11 - net-misc/pytvshows/metadata.xml | 8 - net-misc/pytvshows/pytvshows-0.2-r4.ebuild | 35 --- profiles/package.mask | 1 - 8 files changed, 380 deletions(-) diff --git a/net-misc/pytvshows/Manifest b/net-misc/pytvshows/Manifest deleted file mode 100644 index bfa78c4c306..00000000000 --- a/net-misc/pytvshows/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pytvshows-0.2.tar.gz 14156 BLAKE2B 61449e01096ef81b131c03b0cadd89433a7dcafd3a8828f251ca9ecceb49dd4d92e382ce50b06f4b5498523fd8b4625fb5442e7f5ef71949a4605ab10910be45 SHA512 c4acd9b968dba7af1c787f9a3f5db4986ffbc52bfc43a4b7101070f8e91e80e78be0e59c4a4fbd873e64a6c4862e64abed2396c7140e9165d72e7d3cea267d5f diff --git a/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch b/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch deleted file mode 100644 index ba0a1b91e8e..00000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-ezrss.it.patch +++ /dev/null @@ -1,30 +0,0 @@ -This patch simply alters the feed site since txrss.net was closed/shut down. -Luckily, ezrss.it expects the same arguments and should generally work. You can -find similar details at: -https://sourceforge.net/projects/pytvshows/forums/forum/726961/topic/3309243?message=7544190 - -Yes, this could have been accomplished via the --feed paramater, but this is -more user friendly. - ---- a/pytvshows.orig 2009-09-15 22:36:34.575002779 -0500 -+++ b/pytvshows 2009-09-15 22:43:18.283754081 -0500 -@@ -59,7 +59,7 @@ - -cFILE, --config FILE - Path to config file. Default: ~/.pytvshows.cfg - -fFEED, --feed=FEED -- Override the tvrss.net feed. %%s is replaced with the -+ Override the ezrss.it feed. %%s is replaced with the - exact show name. - -h, --help This help message - -oDIR, --output_dir=DIR -@@ -77,8 +77,8 @@ - commands = ['update', 'subscribe', 'unsubscribe', 'run'] - config = { - 'config_file': os.path.expanduser("~/.pytvshows.cfg"), -- 'feed': "http://tvrss.net/search/index.php?show_name=%s&show_name_exact"; \ -- "=true&mode=rss", -+ 'feed': "http://www.ezrss.it/search/index.php?show_name=%s"; \ -+ "&show_name_exact=true&mode=rss", - 'output_dir': os.path.expanduser("~/"), - 'output_dir2': None, - 'quality_matches': { diff --git a/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch b/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch deleted file mode 100644 index fb78581b04f..00000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-feedurl.patch +++ /dev/null @@ -1,279 +0,0 @@ -David Reitz writes: - -I created this so that I could specify a feedurl parameter in the config file, -which allows me to use the public RSS feeds at showRSS (http://showrss.karmorra.info/). -This patch will ONLY work for seasonepisode. I made no modifications for other types. - -Simply apply this patch and then modify your config like so: - -[Weeds] -feedurl = http://showrss.karmorra.info/feeds/68.rss -episode = 4 -season = 5 -show_type = seasonepisode -human_name = Weeds - -https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413 - ---- a/pytvshows.orig 2009-06-20 15:46:23.000000000 -0400 -+++ b/pytvshows 2009-07-07 20:41:39.000000000 -0400 -@@ -83,11 +83,14 @@ config = { - 'output_dir2': None, - 'quality_matches': { - "[HD": 1, -+ "HDTV": 1, - "[DSRIP": 1, - "[TVRIP": 1, - "[PDTV": 1, - "[DVD": 1, - "[HR": 2, -+ "720p": 3, -+ "720P": 3, - "[720p": 3, - "[720P": 3, - }, -@@ -189,6 +192,7 @@ class Show(object): - self.show_type = args['show_type'] - self.season = args['season'] - self.episode = args['episode'] -+ self.feedurl = args['feedurl'] - #YYYY-MM-DD HH:MM:SS - if args['date']: - self.date = datetime.datetime(*(time.strptime( -@@ -290,7 +294,10 @@ class Show(object): - - def _get_rss_feed(self): - """Gets the feedparser object.""" -- url = config['feed'] % self.exact_name -+ if self.feedurl: -+ url = self.feedurl -+ else: -+ url = config['feed'] % self.exact_name - if config['verbose']: - print "Downloading and processing %s..." % url - r = feedparser.parse(url) -@@ -335,50 +342,21 @@ class Show(object): - if not self.rss: - return False - episodes = {} -- for episode in self.rss['entries']: -- if self.show_type == 'seasonepisode': -- r = re.compile('Season\s*: ([0-9]*?);') -- season_match = r.search(episode.description) -- r = re.compile('Episode\s*:\ ([0-9]*?)$') -- episode_match = r.search(episode.description) -- if not season_match or not episode_match: -- # This might be a special with a title -- r = re.compile('Show\s*Title\s*:\s*(.*?);') -- title_match = r.search(episode.description) -- if title_match and title_match.group(1) != 'n/a' \ -- and title_match.group(1) != '': -- title = title_match.group(1) -- if config["verbose"]: -- print "Found episode with title %s and no " \ -- "season or episode in seasonepisode show." % title -- quality = 0 -- for key, value in config["quality_matches"].items(): -- if key in episode.title: -- quality = value -- break -- date = datetime.datetime(* episode.updated_parsed[:6]) -- obj = EpisodeWithTitle( -- self, -- episode.link, -- date, -- title, -- quality) -- last_key = 0 -- for key in episodes.keys(): -- if key[0] == 0 and key[1] > last_key: -- last_key = key[1] -- episodes[0, last_key] = [obj] -- elif not self.ignoremissingdetails: -- print >> warn, 'W: Could not match season and/or ' \ -- 'episode in %s' % episode.description -- else: -+ # we've defined a feedurl in the config file... -+ if self.feedurl: -+ for episode in self.rss['entries']: -+ if self.show_type == 'seasonepisode': -+ r = re.compile('S([0-9]+)E([0-9]+)') -+ match = r.search( episode.title ) -+ season_num = int(match.group(1)) -+ episode_num = int(match.group(2)) -+ if config["verbose"]: -+ print "Found Show: Season %i, Episode %i" % (season_num, episode_num) - quality = 0 - for key, value in config["quality_matches"].items(): - if key in episode.title: - quality = value - break -- season_num = int(season_match.group(1)) -- episode_num = int(episode_match.group(1)) - if season_num != 0 and episode_num != 0: - obj = EpisodeWithSeasonAndEpisode( - self, -@@ -394,57 +372,117 @@ class Show(object): - elif config['verbose']: - print 'Season or episode number is 0 in %s' \ - % episode.description -- elif self.show_type == 'date': -- r = re.compile('Episode\s*Date:\s*([0-9\-]+)$') -- date_match = r.search(episode.description) -- if not date_match: -- if not self.ignoremissingdetails: -- print >>warn, 'W: Could not match date in %s' % \ -- episode.description -- else: -+ else: -+ for episode in self.rss['entries']: -+ if self.show_type == 'seasonepisode': -+ r = re.compile('Season\s*: ([0-9]*?);') -+ season_match = r.search(episode.description) -+ r = re.compile('Episode\s*:\ ([0-9]*?)$') -+ episode_match = r.search(episode.description) -+ if not season_match or not episode_match: -+ # This might be a special with a title -+ r = re.compile('Show\s*Title\s*:\s*(.*?);') -+ title_match = r.search(episode.description) -+ if title_match and title_match.group(1) != 'n/a' \ -+ and title_match.group(1) != '': -+ title = title_match.group(1) -+ if config["verbose"]: -+ print "Found episode with title %s and no " \ -+ "season or episode in seasonepisode show." % title -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ date = datetime.datetime(* episode.updated_parsed[:6]) -+ obj = EpisodeWithTitle( -+ self, -+ episode.link, -+ date, -+ title, -+ quality) -+ last_key = 0 -+ for key in episodes.keys(): -+ if key[0] == 0 and key[1] > last_key: -+ last_key = key[1] -+ episodes[0, last_key] = [obj] -+ elif not self.ignoremissingdetails: -+ print >> warn, 'W: Could not match season and/or ' \ -+ 'episode in %s' % episode.description -+ else: -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ season_num = int(season_match.group(1)) -+ episode_num = int(episode_match.group(1)) -+ if season_num != 0 and episode_num != 0: -+ obj = EpisodeWithSeasonAndEpisode( -+ self, -+ episode.link, -+ datetime.datetime(* episode.updated_parsed[:6]), -+ season_num, -+ episode_num, -+ quality) -+ try: -+ episodes[season_num, episode_num].append(obj) -+ except KeyError: -+ episodes[season_num, episode_num] = [obj] -+ elif config['verbose']: -+ print 'Season or episode number is 0 in %s' \ -+ % episode.description -+ elif self.show_type == 'date': -+ r = re.compile('Episode\s*Date:\s*([0-9\-]+)$') -+ date_match = r.search(episode.description) -+ if not date_match: -+ if not self.ignoremissingdetails: -+ print >>warn, 'W: Could not match date in %s' % \ -+ episode.description -+ else: -+ quality = 0 -+ for key, value in config["quality_matches"].items(): -+ if key in episode.title: -+ quality = value -+ break -+ date = datetime.datetime(*(time.strptime( -+ date_match.group(1), "%Y-%m-%d")[0:6])).date() -+ obj = EpisodeWithDate( -+ self, -+ episode.link, -+ datetime.datetime(* episode.updated_parsed[:6]), -+ date, -+ quality) -+ try: -+ episodes[date].append(obj) -+ except KeyError: -+ episodes[date] = [obj] -+ elif self.show_type == 'time': -+ r = re.compile('Show\s*Title\s*:\s*(.*?);') -+ title_match = r.search(episode.description) -+ if not title_match: -+ if not self.ignoremissingdetails: -+ print >>warn, 'W: Could not match title in %s' % \ -+ episode.description -+ title = "" -+ else: -+ title = title_match.group(1) - quality = 0 - for key, value in config["quality_matches"].items(): - if key in episode.title: - quality = value - break -- date = datetime.datetime(*(time.strptime( -- date_match.group(1), "%Y-%m-%d")[0:6])).date() -- obj = EpisodeWithDate( -+ date = datetime.datetime(* episode.updated_parsed[:6]) -+ obj = EpisodeWithTitle( - self, - episode.link, -- datetime.datetime(* episode.updated_parsed[:6]), - date, -+ title, - quality) - try: - episodes[date].append(obj) - except KeyError: - episodes[date] = [obj] -- elif self.show_type == 'time': -- r = re.compile('Show\s*Title\s*:\s*(.*?);') -- title_match = r.search(episode.description) -- if not title_match: -- if not self.ignoremissingdetails: -- print >>warn, 'W: Could not match title in %s' % \ -- episode.description -- title = "" -- else: -- title = title_match.group(1) -- quality = 0 -- for key, value in config["quality_matches"].items(): -- if key in episode.title: -- quality = value -- break -- date = datetime.datetime(* episode.updated_parsed[:6]) -- obj = EpisodeWithTitle( -- self, -- episode.link, -- date, -- title, -- quality) -- try: -- episodes[date].append(obj) -- except KeyError: -- episodes[date] = [obj] - self.episodes = episodes - return episodes - -@@ -597,6 +635,7 @@ def main(argv=None): - 'date': None, - 'time': None, - 'ignoremissingdetails': False, -+ 'feedurl': None, - } - for key in args.keys(): - if f.has_option(exact_name, key): diff --git a/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch b/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch deleted file mode 100644 index a0f114588b3..00000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-improved-re.patch +++ /dev/null @@ -1,15 +0,0 @@ -Improved regular expression for matching season and episode; see -https://sourceforge.net/tracker/index.php?func=detail&aid=2818315&group_id=203642&atid=986413 - ---- a/pytvshows.orig 2011-08-17 23:20:16.000000000 +0200 -+++ b/pytvshows 2011-08-17 23:22:30.000000000 +0200 -@@ -346,7 +346,8 @@ - if self.feedurl: - for episode in self.rss['entries']: - if self.show_type == 'seasonepisode': -- r = re.compile('S([0-9]+)E([0-9]+)') -+ #r = re.compile('S([0-9]+)E([0-9]+)') -+ r = re.compile(r'\bS?([0-9]{1,2})\s*(?:E|x)?\s*([0-9]{1,2})\b') - match = r.search( episode.title ) - season_num = int(match.group(1)) - episode_num = int(match.group(2)) diff --git a/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch b/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch deleted file mode 100644 index 0713a029c37..00000000000 --- a/net-misc/pytvshows/files/pytvshows-0.2-rename-var.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/pytvshows.bug 2014-06-19 18:49:42.414928250 +0100 -+++ b/pytvshows 2014-06-19 18:49:50.534957323 +0100 -@@ -255,7 +255,7 @@ - self.show_type = 'seasonepisode' - elif date_match: - self.show_type = 'date' -- elif titlematch and titlematch.group(1) != 'n/a': -+ elif title_match and title_match.group(1) != 'n/a': - self.show_type = 'time' - else: - print >> warn, "Could not determine show type for %s." % self diff --git a/net-misc/pytvshows/metadata.xml b/net-misc/pytvshows/metadata.xml deleted file mode 100644 index b3afcab16c8..00000000000 --- a/net-misc/pytvshows/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">pytvshows</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-misc/pytvshows/pytvshows-0.2-r4.ebuild b/net-misc/pytvshows/pytvshows-0.2-r4.ebuild deleted file mode 100644 index dd398bde85e..00000000000 --- a/net-misc/pytvshows/pytvshows-0.2-r4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 - -DESCRIPTION="downloads torrents for TV shows from RSS feeds provided by ezrss.it" -HOMEPAGE="https://sourceforge.net/projects/pytvshows/"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="" - -DEPEND="" -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/feedparser[${PYTHON_MULTI_USEDEP}] - ')" - -PATCHES=( - "${FILESDIR}/${P}-ezrss.it.patch" - "${FILESDIR}/${P}-feedurl.patch" - "${FILESDIR}/${P}-improved-re.patch" - "${FILESDIR}/${P}-rename-var.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup -} diff --git a/profiles/package.mask b/profiles/package.mask index 88b85042983..1bcf90929c0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -431,7 +431,6 @@ dev-python/dnslib # py2 only. dead upstream. m-n. # Masked for removal in 30 days app-misc/webcomics-collector -net-misc/pytvshows # Jonas Stein <[email protected]> (2020-06-01) # Last rite package due to missing/unclear license.
