Fixing bug 389851 by converting script to python2.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686

diff --git a/net-wireless/crda/ChangeLog b/net-wireless/crda/ChangeLog
index f9940cdf57fcdaa1b9b759ba6f9dc683bf1294da..b66b98248e90eea940842ae5f643f3e884e196d1 100644 (file)
--- a/net-wireless/crda/ChangeLog
+++ b/net-wireless/crda/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/crda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.30 2011/11/12 09:46:20 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/ChangeLog,v 1.31 2011/11/14 09:07:21 gurligebis Exp $
+
+  14 Nov 2011; <gurligebis@gentoo.org> crda-1.1.2-r2.ebuild:
+  Forcing use of python-2 when generating keys, fixing bug #389851
 
 *crda-1.1.2-r2 (12 Nov 2011)
 

diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index 9a0107b8e15f7f799e3312f2e4cd86fd469d79b4..e15be2201dde1ac83b804e58e02d8ece1e7dc760 100644 (file)
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -5,13 +5,13 @@ AUX libnl31-support.diff 1963 RMD160 3fe1689a9c9e91d63a97c8f0c5719ccdb30cdfa9 SH
 DIST crda-1.0.1.tar.bz2 21013 RMD160 9fd99a0cac4e09926b9a97ded4f3f6e3f27298b2 SHA1 5574374fed2de53a0bee49702d6e7448c0c1bf5c SHA256 6b0cfb4d0340b6e239488a46ce92c8d26cec84fe0da06d4c7b7327bf0e932f1f
 DIST crda-1.1.2.tar.bz2 21754 RMD160 b36254bead7c1561646430f945ca484d301c082c SHA1 a180b8cd2b3f37a157ca27da3fc603795e618906 SHA256 e469348a5d0bb933df31995869130f68901de9be02e666437f52125698851864
 EBUILD crda-1.0.1-r1.ebuild 979 RMD160 3f8352b066e9c0b32b173a25c838ac628bd4a6dc SHA1 3d2de561b02e7be68c4a50f34a780d5148b5dab5 SHA256 e5620fd9078b9b8e80e84518d6210b0de645567c1e64093c9c2542ebf08bbfe3
-EBUILD crda-1.1.2-r2.ebuild 1208 RMD160 5f41f35e903e8fa684c2bc05c6ebedf93f4220ff SHA1 598c6ad679b15a844f42e6c935dd664f5721266e SHA256 6fbcc208e62992c6fbd9aea5bd4fcb86a54b12b50d33097fae6f75bbbf56a63a
-MISC ChangeLog 5277 RMD160 304d95579f5c0fae72e17b8f4d017b6166f22dfe SHA1 9b38420f313715d8ebf29f4c75f684191484fa55 SHA256 fee5b899bf257419ceac87397dbff6eb79b5c48e42ab889f6dfd0ab43a59c593
+EBUILD crda-1.1.2-r2.ebuild 1260 RMD160 c9b6aac94fc00c4273005cb86df09a5ba3148413 SHA1 30f4b303c3d36c33dc147b61806fd39ab39c3ebd SHA256 e4552ff9bfed18dd191868781935d90cfba88752982b9171437b0b999dcb83f0
+MISC ChangeLog 5406 RMD160 a7f1d71a0329200eee9b5e8b8f09550ad6e77984 SHA1 ee3bdb15c817171ee1e7801daec90bff56f24631 SHA256 e15f074f14c29e2336f2980fa1e3ce20b593a7d8515aed30d975d4c517bc88dc
 MISC metadata.xml 350 RMD160 f6595505b25e3a4f18c8a80bf2c43a39e9ed3217 SHA1 056be77ff0338c0c07de32cde88815054eec1999 SHA256 fed024e4a74466ff8ac845800a5b1290825fbcee9bdba8f7f3ebc39236e63cb3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6+QFgACgkQsR7PQhRXYEmkCgCeKU7wDJ9kErmh8hn6tiixF6H3
-LkoAn2ttEGHA4cOmNn+64R2SKnTsL+DR
-=sgom
+iEYEARECAAYFAk7A2jIACgkQsR7PQhRXYEk6lwCdF+lnB0uAtJcvNsFZT4OVU2eo
+29wAoILLzVpH9p5MIa0dNsWADGIBNYY+
+=Y+lK
 -----END PGP SIGNATURE-----

diff --git a/net-wireless/crda/crda-1.1.2-r2.ebuild b/net-wireless/crda/crda-1.1.2-r2.ebuild
index 983f0b31ad53cf58277547630bdb26fe880322ce..f1ad19fb16e92ff4114675e9c0c1037329a6df2e 100644 (file)
--- a/net-wireless/crda/crda-1.1.2-r2.ebuild
+++ b/net-wireless/crda/crda-1.1.2-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r2.ebuild,v 1.1 2011/11/12 09:46:20 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/crda/crda-1.1.2-r2.ebuild,v 1.2 2011/11/14 09:07:21 gurligebis Exp $
 
 EAPI=4
-inherit eutils toolchain-funcs
+inherit eutils toolchain-funcs python
 
 DESCRIPTION="Central Regulatory Domain Agent for wireless networks."
 HOMEPAGE="http://wireless.kernel.org/en/developers/Regulatory"
@@ -25,6 +25,8 @@ RDEPEND="${RDEPEND}
 src_prepare() {
        epatch "${FILESDIR}"/libnl31-support.diff
 
+       python_convert_shebangs 2 utils/key2pub.py
+
        sed -i \
                -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
                Makefile || die