Bump version to 2.0.0, fixes bug #521822

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xFC3B17DE05E136A0!)

4 files changed, 93 insertions, 1 deletions

diff --git a/app-crypt/monkeysign/ChangeLog b/app-crypt/monkeysign/ChangeLog
index 27aee2a45587..6703aaaf389f 100644
--- a/app-crypt/monkeysign/ChangeLog
+++ b/app-crypt/monkeysign/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2014/07/29 11:07:53 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.5 2014/11/06 16:50:01 k_f Exp $
+
+*monkeysign-2.0.0 (06 Nov 2014)
+
+  06 Nov 2014; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/monkeysign-1.2-test-no-emit-version.patch,
+  +files/monkeysign-2.0.0-rst2s5.patch, +monkeysign-2.0.0.ebuild:
+  Bump version to 2.0.0, fixes bug #521822
 
 *monkeysign-1.1-r2 (29 Jul 2014)
 
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
new file mode 100644
index 000000000000..4162c357f44b
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-1.2-test-no-emit-version.patch
@@ -0,0 +1,20 @@
+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.0-rst2s5.patch b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
new file mode 100644
index 000000000000..2c3c66c884ed
--- /dev/null
+++ b/app-crypt/monkeysign/files/monkeysign-2.0.0-rst2s5.patch
@@ -0,0 +1,17 @@
+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/monkeysign-2.0.0.ebuild b/app-crypt/monkeysign/monkeysign-2.0.0.ebuild
new file mode 100644
index 000000000000..7f99eb708da7
--- /dev/null
+++ b/app-crypt/monkeysign/monkeysign-2.0.0.ebuild
@@ -0,0 +1,48 @@
+# 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.1 2014/11/06 16:50:01 k_f 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]
+	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"
+}