Fix NameError: Global name 'SMTPException' is not defined. The patch is already submitted and included upstream.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xFED5002857C1ABFA!)

7 files changed, 43 insertions, 125 deletions

diff --git a/app-crypt/monkeysign/ChangeLog b/app-crypt/monkeysign/ChangeLog
index 2a3706925963..5e07ad5c783b 100644
--- a/app-crypt/monkeysign/ChangeLog
+++ b/app-crypt/monkeysign/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/monkeysign
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.7 2014/12/06 12:14:37 k_f Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.8 2015/02/02 22:25:45 k_f Exp $
+
+*monkeysign-2.0.2-r1 (02 Feb 2015)
+
+  02 Feb 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/monkeysign-2.0.2-smtplib.patch, +monkeysign-2.0.2-r1.ebuild,
+  -files/monkeysign-1.1-rst2s5.patch,
+  -files/monkeysign-1.2-test-no-emit-version.patch, -monkeysign-1.1-r2.ebuild,
+  -monkeysign-2.0.0.ebuild, -monkeysign-2.0.2.ebuild:
+  Fix NameError: Global name 'SMTPException' is not defined. The patch is
+  already submitted and included upstream.
 
 *monkeysign-2.0.2 (06 Dec 2014)
 
diff --git a/app-crypt/monkeysign/files/monkeysign-1.1-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-1.1-rst2s5.patch
deleted file mode 100644
index 1dcfae586733..000000000000
--- a/app-crypt/monkeysign/files/monkeysign-1.1-rst2s5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r a9a4b4fb16bb monkeysign-1.1/monkeysign/documentation.py
---- a/monkeysign-1.1/monkeysign/documentation.py	Sun Feb 02 23:56:57 2014 +0100
-+++ b/monkeysign-1.1/monkeysign/documentation.py	Sun Feb 02 23:57:49 2014 +0100
-@@ -161,7 +161,7 @@
-     def run(self):
-         html = 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))
- 
- build.sub_commands.append(('build_manpage', None))
- build.sub_commands.append(('build_slides', None))
diff --git a/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch b/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch
deleted file mode 100644
index 4162c357f44b..000000000000
--- a/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -r cd828dc1ffd9 tests/96F47C6A.asc
---- a/tests/96F47C6A.asc	Tue Sep 02 17:54:40 2014 +0200
-+++ b/tests/96F47C6A.asc	Tue Sep 02 17:55:56 2014 +0200
-@@ -1,5 +1,4 @@
- -----BEGIN PGP PUBLIC KEY BLOCK-----
--Version: GnuPG v1.4.12 (GNU/Linux)
- 
- mI0EUAlt9AEEAMVygQA7sGE7xS5lGk8bPK7vtBuNAb9ETjXmC8jPLZ35KTviRq1c
- NfFl0J66ObgcLEQjl84GMQ6Du6qLDAAgwi/2TqzmoGljXEiOd+lePBOhEV7WgkTx
-diff -r cd828dc1ffd9 tests/test_gpg.py
---- a/tests/test_gpg.py	Tue Sep 02 17:54:40 2014 +0200
-+++ b/tests/test_gpg.py	Tue Sep 02 17:55:56 2014 +0200
-@@ -150,6 +150,7 @@
-         self.assertTrue(self.gpg.import_data(open(os.path.dirname(__file__) + '/96F47C6A.asc').read()))
-         k1 = open(os.path.dirname(__file__) + '/96F47C6A.asc').read()
-         self.gpg.context.set_option('armor')
-+        self.gpg.context.set_option('no-emit-version')
-         self.gpg.context.set_option('export-options', 'export-minimal')
-         k2 = self.gpg.export_data('96F47C6A')
-         self.assertEqual(k1,k2)
diff --git a/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
new file mode 100644
index 000000000000..e920acfa3797
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-2.0.2-smtplib.patch
@@ -0,0 +1,28 @@
+From 9e6699ec432b23d56a0728bb25fc2ed1a47a85e6 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+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
+
diff --git a/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild b/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild
deleted file mode 100644
index e4cec5469cea..000000000000
--- a/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild,v 1.2 2014/11/30 16:41:39 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys"
-HOMEPAGE="http://web.monkeysphere.info/monkeysign/"
-
-SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
-	media-gfx/zbar:0=[python,gtk,imagemagick,${PYTHON_USEDEP}]
-	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="app-crypt/gnupg
-	virtual/mta
-	${CDEPEND}"
-
-PATCHES=("${FILESDIR}/${P}-basename.patch"
-	 "${FILESDIR}/${P}-rst2s5.patch"
-	)
-
-python_install_all()
-{
-	distutils-r1_python_install_all
-	domenu "${FILESDIR}/monkeysign.desktop"
-}
diff --git a/app-crypt/monkeysign/monkeysign-2.0.0.ebuild b/app-crypt/monkeysign/monkeysign-2.0.0.ebuild
deleted file mode 100644
index ba927d69f1eb..000000000000
--- a/app-crypt/monkeysign/monkeysign-2.0.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-2.0.0.ebuild,v 1.2 2014/11/30 16:41:39 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys"
-HOMEPAGE="http://web.monkeysphere.info/monkeysign/"
-
-SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
-	media-gfx/zbar:0[python,gtk,imagemagick,${PYTHON_USEDEP}]
-	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	app-arch/xz-utils
-	${CDEPEND}"
-
-RDEPEND="app-crypt/gnupg
-	virtual/mta
-	${CDEPEND}"
-
-PATCHES=("${FILESDIR}/${PN}-1.1-basename.patch"
-	 "${FILESDIR}/${P}-rst2s5.patch"
-	 "${FILESDIR}/${PN}-1.2-test-no-emit-version.patch"
-	)
-
-python_test()
-{
-	"${PYTHON}" ./test.py || die "Tests fails"
-}
-
-python_install_all()
-{
-	distutils-r1_python_install_all
-	domenu "${FILESDIR}/monkeysign.desktop"
-}
diff --git a/app-crypt/monkeysign/monkeysign-2.0.2.ebuild b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
index 904ca6537901..ebc253519f92 100644
--- a/app-crypt/monkeysign/monkeysign-2.0.2.ebuild
+++ b/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-2.0.2.ebuild,v 1.1 2014/12/06 12:14:37 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-2.0.2-r1.ebuild,v 1.1 2015/02/02 22:25:45 k_f Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -33,6 +33,7 @@ RDEPEND="app-crypt/gnupg
 
 PATCHES=("${FILESDIR}/${PN}-1.1-basename.patch"
 	 "${FILESDIR}/${PN}-2.0.0-rst2s5.patch"
+	 "${FILESDIR}/${P}-smtplib.patch"
 	)
 
 python_test()