Further fixes to ebuild based on feedback. Remove old.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xFC3B17DE05E136A0!

4 files changed, 26 insertions, 63 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/Manifest b/app-crypt/monkeysign/Manifest
index 5c26387ebf7b..9023a47caeee 100644
--- a/app-crypt/monkeysign/Manifest
+++ b/app-crypt/monkeysign/Manifest
@@ -5,23 +5,22 @@ AUX monkeysign-1.1-basename.patch 393 SHA256 68fd68a6c2aad7780a6e940c12d55f65cbc
 AUX monkeysign-1.1-rst2s5.patch 707 SHA256 2f33fb58d6e556f9b36680d87e962e361bc5f326f3e5b12a8ffa2de77d3080aa SHA512 21d6248a8e116899337aa20c48fc42233a4b9e4974a664e59e2a4211d503d7194ece0e4ae637e7a64c40d015845ab0c9617e30cd9baea9866445952840be8ebb WHIRLPOOL b8b5e7cf5af843bbc077a32c8a941f65c717703966e480405e40c4094d4f1eac6eb89f61a88702571ffed7f46532805a47ee403d600aeee9e40254a722857af2
 AUX monkeysign.desktop 188 SHA256 c1bcfa18ddddedf08c90f790ffd598248f580aca362f56f134fe4238b5de2a15 SHA512 e2418323721dd5eb8859558be5693c0ee5d970edb967a3fefb58876802f431cddeccd87708936141d0d691563a1321930fbe28cf753d069441e33de7666c5d99 WHIRLPOOL dc41569388dd9bfa2861519a795c8f62021c8a44ba4211c660c300542e7bf23f66641677079ba13ece520fbee1d9da621ba31114dcdeab777ba509edfbe777d5
 DIST monkeysign_1.1.tar.gz 54807 SHA256 1229c63c9b649b35a156ab69c7e8ef47ff03817c94ce8138107832117ee5fa6d SHA512 8d1e719633291a3ba9efda8057e8b27b41b8e767db68dc02ca07d18579123b0704f0424ae982f047948620027581589d21ae44470137d1f2ff85f1f360bfd512 WHIRLPOOL 907c65d8ec3a5bbc391dfaa91625a215456989d000e1334687cae3ebcec419b10f34bd65c04d170a6130b21b761ac1b7e9db9f9a1b3fa9ba6ec72d893f7464b9
-EBUILD monkeysign-1.1-r1.ebuild 1033 SHA256 26341c66750ba458b3487f5d9d28df9645e8f79a9410f673562e671939258d88 SHA512 115ee96b7af50fe004b0b5f1d5eb3a7009ceaba2b4c5c8dbfd156cbd1349d298a44d6312fae8623b65274f697365a4f8275bd5be5c414613adc36c933ac9f3e8 WHIRLPOOL bca5416f807d2c28569d854d6aed4ceb0466ca922d14a5a531aadb8817930720f050ef919b63fb2545be22e96bda890ea2b8b61f481081267549efd854bd039e
-EBUILD monkeysign-1.1.ebuild 992 SHA256 c224b87b451debdda4cc1bb49feaaddafb5a7f31136f02fb2e2676cc2326d394 SHA512 ec8b613114e1df389675e4d5f5337aa38a951746ed3c71650fb61593b3ce3f2db6db731e8d4572085c0d13f1ba8d0707e44f27bca6ea39b0900e1e44670e0891 WHIRLPOOL 0d8fd0b1cb903bcd8ef09bd3908d73dc69d4869b9d8e2e11209b421dbaab50fa2df8b6b380084c24bafef7773b9fef208a9473c83291cc26126968ac08477f67
-MISC ChangeLog 772 SHA256 98b42879d46150e3e1087fa7b03a33c9fadab440d40ed95160dea48520e4b946 SHA512 ea085b99fe0ad3fcf8b3098c1d750d3eb1b4e15cdfff02572347b1f19f0d52f4f5f7a446385e6cfd549d058c62f9436fa62a0d8b2a4a009c21a1af0a6481bdf2 WHIRLPOOL 2e53d668284777328d3b3fbfff9c4ad031f30959f25cb5aa785212aae25de237c3904ff50c4996ed298ef5167b7863eea5514e000e2973401b29b43ec02efe68
+EBUILD monkeysign-1.1-r2.ebuild 1046 SHA256 a114cdc84d711c9e3508c0b4c504f7c08985b9ec5c07b7c85dfa0c7c039f6b0d SHA512 00433bd0e313276718f5d1f477a6f65e413399b60a932e90ec523c6497733787d6f1ee56710b97c300ea0d164ce326ce5f12bff669f8a0374bdbbd03b708b1ff WHIRLPOOL a5b8e430f4f09734df69d322290958f18e7442ef2162862b66d3c7681829de0fb1e51f3b68a0850bbf83953a73cb22f64bcb25873075a2ffa63a045ea038e035
+MISC ChangeLog 998 SHA256 4fa6fc2b2f9ab419a5b67266539c99f712b4d510ace7e2f7614aca267ca9501c SHA512 7212a6a1cd02ebefd59774b81f1b142f23dcbf95cee56a443dd0f40232796ee875a370009b51a0e039252ad58a4c44a1d4a6ef1857bcf459274211c2120b38a0 WHIRLPOOL 6d7746abce9919fa2833fc678904da54db2c5804d58437d81bf9a9f236ad03c83e0997ad2298d1fd55bd10b35e591b733e5ce0ce0b0d01a9cd11ec38d915e79d
 MISC metadata.xml 237 SHA256 5c58f0c8f9a9d5f50383f6cb306cf688924be830a0be08ede1ae7866c3566c2c SHA512 cd2f27119bff3427ab44b55caf2fc21ed3f56ab1251747a8213ad9914aa284e23e922c73018307a22ccd359906e4b82222a4dab35ef9469129dbc79b4b403b4f WHIRLPOOL 3f039cb8a9e18e11bf4dbd398f81a1b47f4e0a17bf53cb8f642f6cdeeaa13731307111e2f6d34689046a545de8c988a5bf0121473aac548affcb7352ebb1f590
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJT13wgAAoJEPw7F94F4TagWOUP/3IyWG4nVMTxmIRIna+jlhL2
-6EsQhD2dVR7j4jT3O+1bPpxj/CO0rFChTA8GUsqSGWtoXTaUkxSW41KvCAGDicQQ
-zChXpo9S1DM6FEB6zzL3WXF1sR0tD9PsANhauKVmt5PJWb++g+RSpkTt60/oSod5
-GH8GFyPQR2YfR6dlB+xOfgNDTUk7EJcgJdPeffmLpiyJbo/ph5/WMomc0ik4VefJ
-BM0SHIRhzk/nyKxS44+vx0X/XHy5g1Gx+Y5uliR/lFxCaMoIaNbqyQpgYKs3fGA9
-wsz7FaCxNpG3QCc9VycaftcOFyqfH50z/K6ylo+i5icnpE1ifW3gnuW2CebVS7IP
-M5fobnCJtOlW5vYJMQv63XL63yZmtZ3w4y7US+0tq/SV3ceiG8n+/ajPvUpoc9AJ
-+V0+Qp1NzlCjxEd8wKUKb8N47JyVQ8xVsaygIQwiu1RKWX7xduZBjoF0NDZt8jZ9
-zjct7lP1CxzU40cGRT9ZFk6Qijo/MyB0QNmnv6iodgK4FEZgmRRo4BHxFSQ4yWzj
-LzZOtufaNB8VR8NJBeD7TW8EJJe6GakelaeJq5qGAmG2hrh2pW5qjoPoOY5dDBOO
-vQU4rg0/m8AB4OLiPbKYg5vtnF3GrRcydLwk1GCPq1gAAkLVT8tEM+FPAc26oHqD
-F1TMsHviiUf4ggVR3OR0
-=RZ+Y
+iQIcBAEBCAAGBQJT14A7AAoJEPw7F94F4Tagdi0P/3d1V1pMKq1qs6eJDcxRDZY4
+UXj5j9N3N1X9TXuTsplL4SO1BYRy7tpthKLNBGfngs2GOoSNtgttdRNnf/BJreYe
+Qq8zWbjYxpA0635/fX/KMhYHeWA4MrSBMtEt9WpfTdN5KX5eIv7FWQuP9Rr6yivW
+9xcZ78r3RQ5t/HnjaYmin7tmiXipx22a2LZjD17E9fL2C336EgA+R/wrWUvBBPhZ
+0cvrizF4HBU5NkiLIRJBsjYbaWaVyF/cOcXpZh6Cf0SW0+I/Bsv6XFl8xuaxPiZ6
+UwTLoH5BKhZSBCtGb+ZDhdch/7pwz1h7srOVVqRvr/wPv/XNccrLsgjT0DfeFB1u
+mA0xbV4dyhM0+zx+tjhF0qlBQ+IbhhzSJ45Gity7i5uJ92LHVUKw5fKok4FneG7q
+AWQMK8kX+2EysNvvz+qi6gs6fKZvFxulOgGO7HoF0ffGrdgF99LJMX4xhHHyotCm
+/mCzbJr9l0zMu4GfqNAuRjZjdfVTNz+vIhee6ejMk/aKMdAvp72TpW3dDBV5LB3E
+Xw5T8AbhbIwnqLkLubB8meQ6DRPuJ+7wxy9YY03m/0biBQxsM1KlYiVNluZhDKFW
+GMBdwgNBrv9WkWMNiPXzayLGOh70Zh3rAXjtHOTekUIY3VzoQduNIX8pqwGscIU6
+6FkA2BWwz3SSQNf7O4+y
+=GHj8
 -----END PGP SIGNATURE-----
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"
-}