Use Python 2 (bug #315087).

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

4 files changed, 36 insertions, 21 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index f11e65c48236..a074617dc5ee 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.30 2011/04/05 17:28:33 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.31 2011/04/05 17:37:07 arfrever Exp $
+
+  05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  scapy-2.1.0.ebuild, scapy-2.2.0.ebuild:
+  Use Python 2 (bug #315087).
 
   05 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   scapy-1.1.1-r1.ebuild, scapy-2.0.1.ebuild, scapy-2.1.0.ebuild,
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index c90d5e79ce74..77e14cc7445c 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -9,24 +9,24 @@ DIST scapy-2.1.0.tar.gz 956785 RMD160 caca42e89c87c07a2dbe399dd4e5924cefdff48a S
 DIST scapy-2.2.0.tar.gz 972996 RMD160 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e SHA1 ae0a9947a08a01a84abde9db12fed074ac888e47 SHA256 c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af
 EBUILD scapy-1.1.1-r1.ebuild 1788 RMD160 a1f645ecd8c42a3bb3b171de5a66f07edcafe655 SHA1 825608473e0cae0a2b63aa1d7b920cff02673217 SHA256 233b7807500799c6246cac36bda1760f2c58f2db685ba4af5743f03168aa6573
 EBUILD scapy-2.0.1.ebuild 911 RMD160 8309bb8bc41cd7d6f401fef41946bbd2d3c95007 SHA1 c34cd2a2842fa22c22bbda4ba8013e2e789a0338 SHA256 6e473ae25b213c5ca33cd664bb659eba95a1158bfcd859e252712cc4a19a86bd
-EBUILD scapy-2.1.0.ebuild 910 RMD160 5cb98eeb1ac90ed5810680d33aad8bc005a04850 SHA1 0fae09222424a4761911dfdfbc93f4090ee2ea41 SHA256 87556b7bd99ff7c88d614aeb43c46c2f5e5efd079343098fb5240bd918399a34
-EBUILD scapy-2.2.0.ebuild 934 RMD160 6b49097a120b9038834f10daf28530c45b964638 SHA1 370a6208edb4d67c13319d192488027c6e8f22c8 SHA256 4452c3540b948e4e5c12ec574669a1cc877d4f5e96e2eac8938c7640fc8b4dc6
-MISC ChangeLog 4696 RMD160 93de78c3fd75758790025f62987d13b1872005ef SHA1 8352db11e0842772e40f9d41d8a358211d96b172 SHA256 3bc62b58416008a58ef4938f791d667fec511124ae03231c2205a1bad70b87be
+EBUILD scapy-2.1.0.ebuild 981 RMD160 32a88807fedcb77c1a7333aa73386020137e112a SHA1 33a86e17f197a52541e4e7b32d55089aa9972ed2 SHA256 b838f74600052f47935a377e17da9fbce792b7b1349a1748c1265361efd71f3c
+EBUILD scapy-2.2.0.ebuild 983 RMD160 aa9febf38c98c7842a56164f73e69c6eab6e931e SHA1 d18e187a560418f04ffcbcc01ae1a3ba7f4ec757 SHA256 565a1c05240dce358150bbf2f4cce69047ac3ea311961936cddfffbe619ff80b
+MISC ChangeLog 4842 RMD160 9cbaeddbcdc4d77f62c0b9309ca4f301fa35c415 SHA1 57f75eec6ddf62adfb26410b9d8bbad031202b6b SHA256 c81d45c9e04b5a23a180e7240e220849a2096cf7305b3efe9649d97fef96ec98
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNm1FsAAoJENgZr6v6gHY0qTwP/RlFXrcdJlvYs6YoBIAjL78L
-24CSBT5V/8RJK4bnp1CrOrFLm8J6ITnW/ETE1oWMrTYALxqQ2BzQYBQCSlKe8WsC
-BRGVhb9gOdmV7wkljadNtHEoEZRg/Hw+Zva0C409jzqUlbKkdtPYXU9ADgxqPlQe
-RxAhOnOSDODWOsGzvNgItbUryQyJ/IVa/tGgHZ1AsmExugEeGJx98w99aZgB659/
-PuPMUizEHGYLyl+9Sc6hBnzQ98xyvCohl1CKUa6mYAR7FfM2dvBnuy45Uy7kpqPa
-Sih03o17sDiFbqSSD05fXDO2lx1jS/dWyoSqPzsOJWUtlA35XzzK1d622eSnvtBS
-YHNI7Z4r8ACUxMtEkx9kwiQ2EDgYN5hzRO/TrUFhMBPwLcChMZhc3PGQ+fTIB3cq
-699i6zNPJHQG/+cTsm+E1L3xjrikNnDkqFaZ8r8N8QpCSrl+Ds/xFh8FQw90L4pC
-yaMbpY48pkGR9u+tV1YgM07yqWbSVQOW/qqtGBmS3VcTWvXww1m3ETBLLNjfWrpf
-LJnBqWPfL5NOzo7KXded7zyb53I/1mMzbjmN/WM9g910UdwTcNMNDh9q1MbhAr0f
-mhsGwXeiSqEJcCoAbfbqL6nEKZZObpOmLwlDwLX2TVmrnOwVTX7vMe9Yh2+mTifl
-5uGhCrkRvkN2Jfm6KbYc
-=DkPT
+iQIcBAEBAgAGBQJNm1NSAAoJENgZr6v6gHY0xj0P/RkumIXM8tXHlAXKMJMcTncb
+YVbQaCVE+zgL1mKpIHDKmWMasv/Uyz6j1TszJUM/YzD67Ye0sgxobMWaVa0LKPJJ
+naEtGrCOW+wtvaC0ltpUnacN/Rw1Eksm0OK3WFlTnI1G9Ai1tda0DyHxwe5FJyX1
+mSTVN+3f02YbA7GhmooTIIVMRoKczOxTD01YtElNph3T/Ly/qV/Y/EXErgJqo6YA
+ZasA5JRX6V4+5+zHmTtXGc1XAxwcYrIWdSg28eaX1nHm+zC19yRwMMdHymms1fj3
+6NrvFOex/ItB5+KMCO2XlIAGZ2tVsN473VlSHgQbOx+94IVMt5QUkAIp4VcKKXX+
+qIxWYUvSkvlrs0X+2go18hy+nkyXEUVBH4nTTnlEoCoDVaWPSgLqXm1fUB+ftAgg
+6HSeXp0PbDRe148VIDeEWrqyyspEJLhmjK6LfsuKB+6pCJ4nHxR2dcgmLJFrOqSf
+h75xsOjRu6+Cu6I9WnHC8o0I944YO4B/tnE5B8xlr1ftYFLPQJLkpq2U9ZtG1+Oz
+QX3c/E3tUbpy30TO4gLXN7lN0gcw/hhDJfu9olv6gl7d6mcfQ1A1VfixRJ70BNta
+mmNy7TGhjmOK2IpQIkEdoO0eDKNypMDYbLS6AdArEN6BVHPvKLQYm7SNidMvL5zK
+kIAP/WqyXShN3LaCOwS/
+=eRd5
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scapy/scapy-2.1.0.ebuild b/net-analyzer/scapy/scapy-2.1.0.ebuild
index a770a33c1b56..7c5d94d63dbb 100644
--- a/net-analyzer/scapy/scapy-2.1.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.1.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.1.0.ebuild,v 1.5 2011/04/05 17:28:33 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.1.0.ebuild,v 1.6 2011/04/05 17:37:07 arfrever Exp $
 
 EAPI="3"
+PYTHON_DEPEND="2:2.6"
 
 inherit distutils
 
@@ -15,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
-DEPEND="dev-lang/python"
+DEPEND=""
 RDEPEND="net-analyzer/tcpdump
 	gnuplot? ( dev-python/gnuplot-py )
 	pyx? ( dev-python/pyx )
@@ -25,3 +26,8 @@ RDEPEND="net-analyzer/tcpdump
 						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
diff --git a/net-analyzer/scapy/scapy-2.2.0.ebuild b/net-analyzer/scapy/scapy-2.2.0.ebuild
index 561144954920..cdb957640a8d 100644
--- a/net-analyzer/scapy/scapy-2.2.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0.ebuild,v 1.4 2011/04/05 17:28:33 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0.ebuild,v 1.5 2011/04/05 17:37:07 arfrever Exp $
 
 EAPI="3"
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
 
-DEPEND="dev-lang/python"
+DEPEND=""
 RDEPEND="net-analyzer/tcpdump
 	gnuplot? ( dev-python/gnuplot-py )
 	pyx? ( dev-python/pyx )
@@ -27,3 +27,8 @@ RDEPEND="net-analyzer/tcpdump
 						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}