Further fixes to ebuild based on feedback. Remove old.

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

3 files changed, 11 insertions, 47 deletions

diff --git a/app-crypt/monkeysign/ChangeLog b/app-crypt/monkeysign/ChangeLog
index 4d9a4c10e16a..27aee2a45587 100644
--- a/app-crypt/monkeysign/ChangeLog
+++ b/app-crypt/monkeysign/ChangeLog
@@ -1,6 +1,12 @@
 # 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.3 2014/07/29 10:50:19 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/ChangeLog,v 1.4 2014/07/29 11:07:53 k_f Exp $
+
+*monkeysign-1.1-r2 (29 Jul 2014)
+
+  29 Jul 2014; Kristian Fiskerstrand <k_f@gentoo.org> +monkeysign-1.1-r2.ebuild,
+  -monkeysign-1.1-r1.ebuild, -monkeysign-1.1.ebuild:
+  Further fixes to ebuild based on feedback. Remove old.
 
 *monkeysign-1.1-r1 (29 Jul 2014)
 
diff --git a/app-crypt/monkeysign/monkeysign-1.1-r1.ebuild b/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild
index fc0b433007ba..f9d455ec51b4 100644
--- a/app-crypt/monkeysign/monkeysign-1.1-r1.ebuild
+++ b/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2014/07/29 10:50:19 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/monkeysign/monkeysign-1.1-r2.ebuild,v 1.1 2014/07/29 11:07:53 k_f Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -20,13 +20,13 @@ IUSE=""
 CDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
 	media-gfx/zbar:0=[python,gtk,imagemagick]
 	media-gfx/qrencode-python[${PYTHON_USEDEP}]
-	virtual/python-imaging:0="
+	virtual/python-imaging[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}"
 
-RDEPEND="app-crypt/gnupg:0=
+RDEPEND="app-crypt/gnupg
 	virtual/mta
 	${CDEPEND}"
 
@@ -34,7 +34,7 @@ PATCHES=("${FILESDIR}/${P}-basename.patch"
 	 "${FILESDIR}/${P}-rst2s5.patch"
 	)
 
-python_instal_all()
+python_install_all()
 {
 	distutils-r1_python_install_all
 	domenu "${FILESDIR}/monkeysign.desktop"
diff --git a/app-crypt/monkeysign/monkeysign-1.1.ebuild b/app-crypt/monkeysign/monkeysign-1.1.ebuild
deleted file mode 100644
index 669776d20635..000000000000
--- a/app-crypt/monkeysign/monkeysign-1.1.ebuild
+++ /dev/null
@@ -1,42 +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.ebuild,v 1.2 2014/07/29 08:02:07 k_f Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A user-friendly commandline tool to sign OpenGPG keys"
-HOMEPAGE="http://web.monkeysphere.info/monkeysign/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SRC_URI="mirror://debian/pool/main/m/monkeysign/monkeysign_${PV}.tar.gz"
-
-DEPEND="dev-python/docutils:0=
-	dev-python/pygtk:2=
-	media-gfx/zbar:0=[python,gtk,imagemagick]
-	media-gfx/qrencode-python:0="
-
-RDEPEND="${DEPEND}
-	virtual/python-imaging:0=
-	dev-python/setuptools:0=
-	app-crypt/gnupg:0=
-	virtual/mta"
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}-basename.patch"\
-	       "${FILESDIR}/${P}-rst2s5.patch"
-	distutils-r1_src_prepare
-}
-
-src_install()
-{
-	distutils-r1_src_install
-	domenu "${FILESDIR}/monkeysign.desktop"
-}