dev-python/pycrypto: Add missing call of distutils-r1_python_prepare_all

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 35 insertions, 16 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index fbd60fb7839e..abe400c308dd 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.159 2014/12/10 16:33:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.160 2014/12/11 09:28:17 jlec Exp $
+
+  11 Dec 2014; Justin Lecher <jlec@gentoo.org> pycrypto-2.6.1-r1.ebuild,
+  metadata.xml:
+  Add missing call of distutils-r1_python_prepare_all
 
 *pycrypto-2.6.1-r1 (10 Dec 2014)
 
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index 6f23203b32bd..1e8539485be2 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,15 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST pycrypto-2.6.1.tar.gz 446240 SHA256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c SHA512 20a4aed4dac4e9e61d773ebc1d48ea577e9870c33f396be53d075a9bf8487d93e75e200179882d81e452efd0f6751789bac434f6f431b3e7c1c8ef9dba392847 WHIRLPOOL b63734145729f75838357002956297d1ea9e51288939e6f481eaaa12c7da256ab95e4d80d19e618445224fb46a8e2cb1ef5ee0b4b817767d472e3a7c4707371b
-EBUILD pycrypto-2.6.1-r1.ebuild 2054 SHA256 ae54fab9731f29e0163960b816a7a75b6bdbd688c03bc673b417bf1759abbb2c SHA512 683e5f9fa33ed1db7e97ca1648d19fa27b7e38a290c86ee184ab1d70b8bb666127a1a1b77c8f4a2ad5eacb2cfd8acb2d0d92416adc47cb26c3676f429e95a0dc WHIRLPOOL 00c344ef7df1f79ad839698bfae5ff7215e85d7dbce723ce805860925e583c7421eb349e15abd75c68b719884a06f841ffb7ec19123015212a025029e0e72b83
+EBUILD pycrypto-2.6.1-r1.ebuild 2113 SHA256 4449ce1967ff7d6b09116fd27ac7db1a10218d84bdc22cdf5f1cb3b0fddf37b2 SHA512 9acdb2e8f83919cde98a41dd193b5d134ffcfaede99d41803cf4c4579805c6643d6580541098abd457e89cc344b1356425515e570627f295ab1b59b966d7c3fe WHIRLPOOL 4ae8be114aebb67a86c0e2e599662433d54c58a831ad22ce2a227fbebe5fe4d7a6217ca046bdf52e2d745387621467d7bd2fbf4b702215cbc5ee5199d3788dac
 EBUILD pycrypto-2.6.1.ebuild 1612 SHA256 54482620680fd115a303aab372eaccbdb7c926d546670c2a1efaed88977adb19 SHA512 20b79d795d356b9eb911056570efce3d1a53a276093c30b6353191c408e834d64ded7c20b709b1e22e0dfe93738a022593d6467cc085c863c91d6a6bc71e0b9e WHIRLPOOL 7bfa52f08821f8f1194a7b725e99603f64f0d6b52826c938233bbb82cabefc052753af38ecf071957787bf627533767d1fa578577821f7a7fff806a0dbcf4f83
-MISC ChangeLog 20141 SHA256 3fd4edccb1eb3614a5a9f1cdb2ae3a764a4f224c3d385243d0e965e97cbc35fb SHA512 23d3e4ac27491844cdc9dbb28564f4c0278ccff15991c64bd550d1965f29297a65aa363dcfe2ca4a247cee6ef71624267eb09ce2a9021d95c4ffee5a8672c163 WHIRLPOOL 6a16529b19945b2b729adfd180bbc925cd155bb43afdf1336bb2cec86e684b381ae15ae73b2f855558ac8dff230bd973f0b7255370d3cd44a38ac1bd5429f61f
-MISC metadata.xml 1774 SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2 SHA512 162e3dd991ee53845dc67a5fa711042ce6ae00c2d0d536824c3629b361d5369568d8aca152f4113772c267263b568f944f6a9d2424a1941c59e0e5cd5c4d7a03 WHIRLPOOL 7a9f5e7b2cecaf727d1110594c3c8d521a8cde676cdd072872ffd99bde0619ffbd54455bad73e34c0917944608b42395d1de0abfbb7f3a7a755de6aa9d277f1e
+MISC ChangeLog 20282 SHA256 03984dddcde4ff65352b4802019ca93ccf435e70768cdd8e894707883c79e2d8 SHA512 e0d929bb99121ff6c220edb34b6567ee1f78a1e5fcd344e3831fe54be042dd97991efa365f818beb05c789eafbd8c0a1dfe78e0f3f03948bb5a0eb23b84d8308 WHIRLPOOL de214f921778e45ea974e52bfbb1cfa40f1ccb2d9588a883b5b784dbdafe3992f588d659b1eee14dc73d780adb379f009da4764f543c2b94322805869c6ef630
+MISC metadata.xml 1780 SHA256 d07af31b90f2087d96cc59afcc486fa29d29e0f64a3e6cf84514dc3f16976c65 SHA512 55224bb96009e47e2055e2ffe08840c9899dc37724d7789e99d004c4661e6e1baf192d7ade42fd0112d2e217b4aa79aca6ecf5f11c5a3db429cdc690a34893e3 WHIRLPOOL b4b93fba0487ad44400ec040b317fc435c36cd1eb684f058a6c670f8d52ce8c5ca78a67469bc59aa58eb6a866337e84028005e45e1c187cc95a024308ff0acbf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSIdfkACgkQso7CE7gHKw0KLQCg0yteQlmNAUgsGqbZqC9W4Z6k
-OksAoMYNAkUnOkCAFZ2XMpL0O2aea83s
-=sGi0
+iQJ8BAEBCgBmBQJUiWOyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirGgoQAKCJgk9LGjJorjsrd+N77zPo
+EQr/eWfUighfy0vUrrhJa12DE8I1JZMd30b9W0qcHb74jI0Pa5SMF6t3XbWLXjk2
+7FJ1o+5S4TCzXQtQK2+0ZLK+tpnMrSFhOv7bBPFmBjfeVcXW9BKRuDTzDdAy21PU
+ldiI9fnvZWnithzupYfisMDsTmqNuws/+nB/HQBiBBKFKONKcTl17Ih84WWhXr5O
+7wzV+fLoAHCLfTgEzXegz09DFTX/z5iVUeTzQi3vU8iMWqTTI4bNYCE+SxU2HqAF
+tIZBN+is7agdD45sIOVQr+B8pHQ9mBaeOE7SzLzFobvO5XU2BdEHny4gQ1//ApIx
+/WZtt62uM8T/T45POZg1gHO2KL4bzNbmblfltcagl7+elmW0ClFk7b+djCSPBPrK
+RJAkowEOkRKNrD4bmSf5CJmaajKizSbIo/lNwSgygO8RpT8ySUPUiabcg/3Znvjk
+8HDdO4Q/LtTwoMKkrGxhzthIEphw85paY+TmOje7/T/A7qbP4Jl+buLS41xBJSY/
+zcOGyy3Zxr0go3O1HXGYF8u80SsWxLON0sguc5ARSoQk2a08JpiFtrRySnk/79AE
+QW1qNRUdOQqiYBJWEvNFXGwbbobCSwsSF+nxbHNg9nI9Kzaxu0UlImQsi0Gl9qGv
+HOFLGoqBI2uZfzJA6Aft
+=fTyU
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/metadata.xml b/dev-python/pycrypto/metadata.xml
index a07fbd59d943..15b44a0ae34f 100644
--- a/dev-python/pycrypto/metadata.xml
+++ b/dev-python/pycrypto/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<longdescription>
+  <herd>python</herd>
+  <longdescription>
 The Python Cryptography Toolkit is a collection of cryptographic
 algorithms and protocols, implemented for use from Python. Among
 the contents of the package:
@@ -18,7 +18,7 @@ the contents of the package:
 	* Some demo programs (currently all quite old and outdated).
 
 </longdescription>
-<longdescription lang="ja">
+  <longdescription lang="ja">
 このPython言語のクリプトグラフィー・ツールキットは、暗号手法のアルゴリズムとプロ
 トコルの集合で、Python言語から利用されるための実装です。このパッケージ内容は以下
 です。
diff --git a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild b/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
index c0f7d8512aaa..de60020a2489 100644
--- a/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.1-r1.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/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild,v 1.1 2014/12/10 16:33:39 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.1-r1.ebuild,v 1.2 2014/12/11 09:28:17 jlec Exp $
 
 EAPI=5
 
@@ -19,8 +19,10 @@ IUSE="doc +gmp"
 
 RDEPEND="gmp? ( dev-libs/gmp )"
 DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils
-		$(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' python2_7) )"
+	doc? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/epydoc-3[${PYTHON_USEDEP}]' python2_7)
+		)"
 
 python_prepare_all() {
 	# Fix Crypto.PublicKey.RSA._RSAobj.exportKey(format="OpenSSH") with Python 3
@@ -29,7 +31,8 @@ python_prepare_all() {
 		-e "/keyparts =/s/'ssh-rsa'/b('ssh-rsa')/" \
 		-e "s/keystring = ''.join/keystring = b('').join/" \
 		-e "s/return 'ssh-rsa '/return b('ssh-rsa ')/" \
-		-i lib/Crypto/PublicKey/RSA.py
+		-i lib/Crypto/PublicKey/RSA.py || die
+	distutils-r1_python_prepare_all
 }
 
 python_configure_all() {