commit: 9ade7feb522e945c5e86a450a912914d1b39b092 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Dec 2 08:12:19 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 6 13:28:46 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ade7feb
app-crypt/monkeysign: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/6392 .../monkeysign/files/monkeysign-2.0.0-rst2s5.patch | 17 ------------- .../files/monkeysign-2.0.2-smtplib.patch | 28 ---------------------- 2 files changed, 45 deletions(-) diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch deleted file mode 100644 index 2c3c66c884e..00000000000 --- a/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -r 9cf95971dd10 monkeysign/documentation.py ---- a/monkeysign/documentation.py Sun Oct 19 12:34:21 2014 -0400 -+++ b/monkeysign/documentation.py Sun Oct 19 12:35:30 2014 -0400 -@@ -161,11 +161,11 @@ - def run(self): - html = os.path.join(os.path.dirname(self.file), os.path.splitext(os.path.basename(self.file))[0] + '.html') - self.announce('processing slides from %s to %s' % (self.file, html), 2) -- os.system('rst2s5 --theme default "%s" "%s"' % (self.file, html)) -+ os.system('rst2s5.py --theme default "%s" "%s"' % (self.file, html)) - - def has_rst2s5(build): - """predicate for this class: do not fail if rst2s5 is missing""" -- return (os.system('rst2s5 < /dev/null > /dev/null') == 0) -+ return (os.system('rst2s5.py < /dev/null > /dev/null') == 0) - - # (function, predicate), see http://docs.python.org/2/distutils/apiref.html#distutils.cmd.Command.sub_commands - build.sub_commands.append(('build_manpage', None)) diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch deleted file mode 100644 index e920acfa379..00000000000 --- a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9e6699ec432b23d56a0728bb25fc2ed1a47a85e6 Mon Sep 17 00:00:00 2001 -From: Kristian Fiskerstrand <[email protected]> -Date: Mon, 2 Feb 2015 20:38:07 +0100 -Subject: [PATCH] ui.py: Make sure to use smtplib namespace - -Make sure to properly use the smtplib namespace for SMTPException -in order to avoid a NameError for undefined exception in global -scope. ---- - monkeysign/ui.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/monkeysign/ui.py b/monkeysign/ui.py -index c9b6a30..c2308c8 100644 ---- a/monkeysign/ui.py -+++ b/monkeysign/ui.py -@@ -359,7 +359,7 @@ expects an EmailFactory email, but will not mail if nomail is set""" - self.abort(_('Unexpected SMTP server error while talking to %s, code: %s (%s)') % (self.options.smtpserver, code, srvmsg)) - try: - server.starttls() -- except SMTPException: -+ except smtplib.SMTPException: - self.warn(_('SMTP server does not support STARTTLS')) - if self.options.smtpuser: self.warn(_('authentication credentials will be sent in clear text')) - if self.options.smtpuser: --- -2.2.2 -
