Clean ebuild, patch by Arfrever

Package-Manager: portage-2.1.10.63/cvs/Linux x86_64

3 files changed, 20 insertions, 24 deletions

diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 7fb77f93bc3d..1005e54a8664 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pycrypto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.117 2012/05/26 12:19:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.118 2012/05/26 12:49:29 maksbotan Exp $
+
+  26 May 2012; Maxim Koltsov <maksbotan@gentoo.org> pycrypto-2.6.ebuild:
+  Clean ebuild, patch by Arfrever
 
 *pycrypto-2.6 (26 May 2012)
 
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index c11a347508e3..f351f65a53d4 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -9,17 +9,18 @@ DIST pycrypto-2.6.tar.gz 443445 RMD160 5782b529d59f2a62951607fdafaa434aea13ee0a
 EBUILD pycrypto-2.3.ebuild 1874 RMD160 552e850883f198a2d0b4de3b4a7cc1716b9ee031 SHA1 38540804b95749fbdbc730850f3a86c836185a3f SHA256 14eeddcee8470a4cf4e43367089f66adf7387a96fe7d6ba2ec517754f389ebe8
 EBUILD pycrypto-2.4.1.ebuild 2016 RMD160 bc80cf9a4a14fa01e686329851d8f9c2bc32a203 SHA1 74955f8e3499dd3e5135bd193507946eb139b269 SHA256 4335b3f36e779c7c7ce362a80404244db574855542977b49bfe4b9f4aff0bbe1
 EBUILD pycrypto-2.5.ebuild 2026 RMD160 357bfa264c671f80c5cdc120a63f17ca9d6519ea SHA1 bdd694a381e917d891a37789b36443628ff4029c SHA256 c6eb1f5e09bc3565557237bddc27c4cd9400ac6cc984eb9bd47e4a40b3c4fa56
-EBUILD pycrypto-2.6.ebuild 1902 RMD160 6d357680aa44f4ab6c1185ac9b55b5b0d95a0e43 SHA1 5a0de7869dff76314e145c37eb948b97e90630e4 SHA256 5a58a4fb3d8878c13868dd10be89c5fc143eb6b9363344ad2af033aa19275d9d
-MISC ChangeLog 15273 RMD160 487c33dbbe0328acec44d61387f8c8fb4c9a572d SHA1 c79d2133898020354e3a168da06af465ab5c0527 SHA256 9ed2270854a1ba79ba5f6dc1728a65e4cba7df8dc117702a449c3cb78d60bc6d
+EBUILD pycrypto-2.6.ebuild 1587 RMD160 49280e8bf82523cb107163baed5af0c23812b457 SHA1 baf6fcf38eb2efb3767c3e07b601f27b2e0d02e3 SHA256 65abb90107f17459e00c8e14e78c0f98f61508611bb053d373eb81d11c806a32
+MISC ChangeLog 15381 RMD160 9ca27542f3e95967bcaa74579b20b2a62ac91a80 SHA1 accd7f82fca21c3506448dfdb74d54a8c9b88b07 SHA256 84baf50c5b8217ce15fca1d24602c9e2373915eba6e5f8d639ed00268094d638
 MISC metadata.xml 1774 RMD160 b0aeda4d69c1dc4ec798f05f617a2d0ddf8c29ab SHA1 00da4a85672688868003fecd52b3a9497a3c433c SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2
+MISC pycrypto-2.6.ebuild.orig 1880 RMD160 71235e5d24f37f375ca896a4bf922cb7846ee2bc SHA1 fd856916db8a1b772e83ef7b9fd1d286c7d919ea SHA256 498e314021b8c32d58243a5b962dae1e11a8694e991cef2b7feaa34cb2dee30b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPwMqCAAoJEAmJmMX429reboUIAIgBSk8hNtgjgZqVvzOXL+36
-sdc1mCLDZ1UB0mfvYOpn5E8tvQN4pNyPTum7YAZI2wFSkymzg5v6NJ7P3V+LWudX
-P9eHLZZLuubjrpajM0svq6Jd49qL3tx3AAUifSJOx9MT1detUUQjR8nBscRMHisj
-vzmYtjbORFG+xTpeFZyM73YQ4D87BHjk22vDMphMUs5pkP/Vl5w7T8pKTKFjQLGv
-YiNmg+qqqTAaFW3dhwMlutCgl2QbDj1k+t7pWpJxGHq7ZWBajViLWPF+dH4Z+IMj
-ysuEOY2qhscZBLKrPD11df/X0BfXLvLp5hcWCstKvG7gRvGJaR4py5Rw+GgCCoU=
-=E1Zu
+iQEcBAEBAgAGBQJPwNF3AAoJEAmJmMX429remQkIAIHX+ZVxi1I5FqE4nkvvzHl+
+fj/RtjsjW8dCoYxiDbX9zjGUsm0WysHKhH5boCxnoSYX6kl33eJsbcfX21bYxnqh
+vn6S2nOr8DO20FzIg0snPvAviSSZAwqRQNPFufLMY4A7yamcG9f72Zjel034ORyN
+pViQq2LqGrZxRbeDBsjqXQNph3Qe/TRwifbgxFp4LDfMi7BOnQIu3jGHwLWYzVu9
+JRfhxDkJXvbEpFwFKk6NF1x4WXJPbxpyzdBHGAuczfQFuY5xo96RfbsGHsVk52qe
+L9NIP0qK3rwKk78MYNLj4estMv3ts6H4GSVG90sZd821aIQsORfC2al2B6XjdHI=
+=fn5f
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/pycrypto-2.6.ebuild b/dev-python/pycrypto/pycrypto-2.6.ebuild
index 97b69b02d85c..89767edb53d4 100644
--- a/dev-python/pycrypto/pycrypto-2.6.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.6.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.1 2012/05/26 12:19:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.6.ebuild,v 1.2 2012/05/26 12:49:29 maksbotan Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.dlitz.net/software/pycrypto/ http://pypi.python.org/pypi/pycrypto"
@@ -23,22 +23,15 @@ RDEPEND="gmp? ( dev-libs/gmp )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/docutils >=dev-python/epydoc-3 )"
 
-# Some tests fail with some limit of inlining of functions.
-# Avoid warnings about breaking strict-aliasing rules.
-PYTHON_CFLAGS=("2.* + -fno-inline-functions -fno-strict-aliasing")
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
 DOCS="ACKS ChangeLog README TODO"
 PYTHON_MODNAME="Crypto"
 
-src_prepare() {
-	distutils_src_prepare
-}
-
 src_configure() {
-	#Mimic behavoir of 2.5 ebuild about disabling mpir
 	econf \
 		$(use_with gmp) \
-		--without-mpir || die "econf failed"
+		--without-mpir
 }
 
 src_compile() {
@@ -55,7 +48,6 @@ src_install() {
 	distutils_src_install
 
 	if use doc; then
-		dohtml Doc/index.html || die "dohtml failed"
-		dohtml Doc/apidoc/* || die "dohtml failed"
+		dohtml Doc/apidoc/* Doc/index.html
 	fi
 }