Fix deprecation warnings.

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

6 files changed, 34 insertions, 19 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index f33e31e072cc..f11e65c48236 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2011/04/05 05:42:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.30 2011/04/05 17:28:33 arfrever Exp $
+
+  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,
+  scapy-2.2.0.ebuild:
+  Fix deprecation warnings.
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> scapy-1.1.1-r1.ebuild,
   scapy-2.0.1.ebuild, scapy-2.1.0.ebuild, scapy-2.2.0.ebuild:
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 6b860cb80bd7..c90d5e79ce74 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -7,16 +7,26 @@ DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 S
 DIST scapy-2.0.1.tar.gz 864953 RMD160 a4af2137458ad4ffa573ed81303506fdceefbc95 SHA1 fceb4e60fbea0f2ce8ed258957a5eca1baa05ac5 SHA256 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1
 DIST scapy-2.1.0.tar.gz 956785 RMD160 caca42e89c87c07a2dbe399dd4e5924cefdff48a SHA1 e507bc0f2a32d209f321580c9338d2ceb72ab93a SHA256 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
 DIST scapy-2.2.0.tar.gz 972996 RMD160 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e SHA1 ae0a9947a08a01a84abde9db12fed074ac888e47 SHA256 c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af
-EBUILD scapy-1.1.1-r1.ebuild 1827 RMD160 6554bf26edd1ea7fb919048da01a41976b243eb6 SHA1 e525ade5251d9440ed50093d2815fec7857ba0cf SHA256 58e7d3d8a13a6b972e9f980e77f37be14e49103035bc2a5130ca6f89e04e6609
-EBUILD scapy-2.0.1.ebuild 906 RMD160 4e6afe0a00e8a1803bf6516f83946004a223a74f SHA1 2032afd32a32982d95be76659a4423d50e645e7e SHA256 33c04c3fa1e70528d25adbe62b81c59d2fe80d7bfc0c93af4d62bf1afc07f30a
-EBUILD scapy-2.1.0.ebuild 905 RMD160 362493b9f53f00fc5dce403b8296440a594a4178 SHA1 5031e09a65f675def4bf341c2df95992857add78 SHA256 9a85335db7ee553a26960c1e6a47595f5abf53c460751fd711020d309d5450b1
-EBUILD scapy-2.2.0.ebuild 929 RMD160 a1ccc3473b156e75ccfdf60f5ddf877e342a71a4 SHA1 810c2472b41f15d86129d178462b61377baaf645 SHA256 47197d3038429f54ae858dbab001f3fc23615b144ce190aa59d91d15fc53eb1c
-MISC ChangeLog 4502 RMD160 01f475232649c5a8b337626d4c5e4b546aa1fc56 SHA1 8bd1c66ba172604a734083ffc9902c9e7a293c49 SHA256 378778cf44c6047f523cfb031a965104b6dc55dbfdab0ab9ed976761ccfaa5d2
+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
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2arAAACgkQOeoy/oIi7uxRZgCeO5qa/mCA8d7WASOTxhQzX3J9
-fbsAoNkxADwRWsLAMSZxqTe1k88rPgXe
-=Louo
+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
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
index 694e7663e047..6e79479bf4aa 100644
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
@@ -1,8 +1,8 @@
 # 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-1.1.1-r1.ebuild,v 1.7 2011/04/05 05:42:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.8 2011/04/05 17:28:33 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit eutils python multilib
 
@@ -45,7 +45,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize $(python_get_sitedir)/scapy.py
+	python_mod_optimize scapy.py
 
 	einfo ""
 	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
@@ -58,5 +58,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/scapy.py
+	python_mod_cleanup scapy.py
 }
diff --git a/net-analyzer/scapy/scapy-2.0.1.ebuild b/net-analyzer/scapy/scapy-2.0.1.ebuild
index dc2dce9c9a97..c36f71e77a0d 100644
--- a/net-analyzer/scapy/scapy-2.0.1.ebuild
+++ b/net-analyzer/scapy/scapy-2.0.1.ebuild
@@ -1,8 +1,8 @@
 # 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.0.1.ebuild,v 1.4 2011/04/05 05:42:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.1.ebuild,v 1.5 2011/04/05 17:28:33 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit distutils
 
diff --git a/net-analyzer/scapy/scapy-2.1.0.ebuild b/net-analyzer/scapy/scapy-2.1.0.ebuild
index 521a6b66c186..a770a33c1b56 100644
--- a/net-analyzer/scapy/scapy-2.1.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.1.0.ebuild
@@ -1,8 +1,8 @@
 # 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.4 2011/04/05 05:42:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.1.0.ebuild,v 1.5 2011/04/05 17:28:33 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit distutils
 
diff --git a/net-analyzer/scapy/scapy-2.2.0.ebuild b/net-analyzer/scapy/scapy-2.2.0.ebuild
index 776b93bb49d2..561144954920 100644
--- a/net-analyzer/scapy/scapy-2.2.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2011/04/05 05:42:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0.ebuild,v 1.4 2011/04/05 17:28:33 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 PYTHON_DEPEND="2:2.6"