Force usage of python2. Patch by Ian Delaney. Resolves bug 367801.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

diff --git a/net-analyzer/w3af/ChangeLog b/net-analyzer/w3af/ChangeLog
index bf18cf807483ca22aff9d493493760185c9be396..9e7910c56f2973867744a96b97d3e7fac58a673f 100644 (file)
--- a/net-analyzer/w3af/ChangeLog
+++ b/net-analyzer/w3af/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/w3af
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.11 2011/07/15 20:18:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.12 2011/12/21 08:04:44 floppym Exp $
+
+  21 Dec 2011; Mike Gilbert <floppym@gentoo.org> w3af-1.0_rc5-r1.ebuild:
+  Force usage of python2. Patch by Ian Delaney. Resolves bug 367801.
 
   15 Jul 2011; Markus Meier <maekke@gentoo.org> w3af-1.0.ebuild:
   x86 stable, bug #372809

diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index e97acce008831e13516f24191d04d8fb7ac8ffd9..566472e903d29061711b63e28d7943599690b794 100644 (file)
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -7,15 +7,13 @@ AUX w3af_gui 41 RMD160 ef08894b771089f92271cb57fe508f429b5a2c49 SHA1 0d213bd93b3
 DIST w3af-1.0-rc5.tar.bz2 40592636 RMD160 480f8cd02981b2733167a14faf80c7a7b701da28 SHA1 0583f6fa8c2422ca701ecdc530751f6fe99ef388 SHA256 afdd6a37613b8f67cc991a864aeafc32f534399eb0c712a77d8422be363deb32
 DIST w3af-1.0-stable.tar.bz2 39909370 RMD160 58a743de9aa76f1e1d77f21df446dafa6e4ad15a SHA1 bb269d12c77fc310f8fb3cd7ae81c9a1ca6b8318 SHA256 9aaa651e706fe0c4c2cff95879d614cdcb9791e5120cccc527fcb82922d76fc8
 EBUILD w3af-1.0.ebuild 1717 RMD160 a276896987f2e88bd19de293fab426a14ae99c58 SHA1 6acf5d463c35f53b6656bf10194d86b2928c99ec SHA256 1b6f56d37656befa522d5cbd982ea33ea42693e9f27324e2475741d2dbc3e21e
-EBUILD w3af-1.0_rc5-r1.ebuild 1703 RMD160 9920f8564a7ab8ff2baf8699405f399fe7388354 SHA1 b27fc0d3eb2458d73b42c90e56e9244f8f9548d2 SHA256 c4d9569b48481b994a7b457530b171c787b883ad06bd771022de508fef89b552
-MISC ChangeLog 2261 RMD160 e8fbd211717038910cfe692f86931de8b5bdbd04 SHA1 a9ac444a208ff998b024aa89fdc40fa0650efa39 SHA256 a170a9521e01cceb760fe875e1d37db28b8c3eeb80dd346f7170c39170b4e7f4
+EBUILD w3af-1.0_rc5-r1.ebuild 1721 RMD160 e615f707d91c73e0f6940e23ee5437583062f348 SHA1 9a3815a6d3d6e6ca2b58f21e2c9860c5689012f1 SHA256 4ce85105ef980864fed4d25b928d8e6b8301dc031a76c5391c5588c4ce221572
+MISC ChangeLog 2405 RMD160 823c43b90ff4836a7bd35703baa9b67cec234b58 SHA1 a58debb576d25aa68557dddcb6fa8193714346af SHA256 75799afd6ec4f2e2f3ae9f0ae22d6b5b23f37109db979e243b1abc7ac031bb61
 MISC metadata.xml 504 RMD160 192983433233357a5f8b0ea09289ecdada8f18f2 SHA1 8c4e670821607ecd523c756d6f1fe6f302f4ffbc SHA256 85b7d3294638ac0c4db56860559b85b6f2eb6dba424a31e78cdb1fb3543c9326
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59p/QACgkQfXuS5UK5QB065wP/UB34X9XpAXl7S3kCnST1reB3
-SrFKbZuiVzO5aCCEJrzp28+zG57qi3VIJUp4DXOjLxBLs6R4PiXaoLRCjqOp6Z8L
-mg0TxGuV/pOpFq6jGB27SdtkaJvTOezIBgmdQdqKqBARQXvpAQpFas089JUfVInG
-ULfmLD4o/LEnxxRsiK4=
-=CTK9
+iF4EAREIAAYFAk7xkyIACgkQC77qH+pIQ6Rm0wEAnedV2Q3wSwjDsR+3G073WBNB
+5tMUMVHSsLRmyxuYGs8A/26DjZ0bhQqh5CeJaV/+NK81ZrLF9X+hyLQyyGtkMhiV
+=WdqI
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild b/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild
index 27a66f18e38be070d5854cf2542a4a1e9ec365de..a195dcd005429bd518a25ac9d19c11d400e4d622 100644 (file)
--- a/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild
+++ b/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild,v 1.1 2011/05/27 09:48:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild,v 1.2 2011/12/21 08:04:44 floppym Exp $
 
 EAPI=2
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
 
 inherit multilib python versionator
 
@@ -41,6 +40,10 @@ RDEPEND=">=dev-python/fpconst-0.7.2
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_prepare(){
        rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,simplejson,SOAPpy,yaml} || die
        rm readme/{GPL,INSTALL} || die