Delete call to deprecated python_version().

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

3 files changed, 13 insertions, 20 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 8ecbae33d96c..8e4a3e9a4750 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scapy
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.24 2009/12/22 02:17:49 ikelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.25 2010/05/31 16:57:46 arfrever Exp $
+
+  31 May 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  scapy-1.1.1-r1.ebuild:
+  Delete call to deprecated python_version().
 
 *scapy-2.1.0 (22 Dec 2009)
 
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 38a9ccbcc57e..68a3342515ff 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ethertypes 1317 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 SHA1 6ed0fe2446666876d77b8971fd8edf495a9c0be3 SHA256 e140071e462df8aab9f7b63a3965bf206797ecbcff334a3ec494256defe35dcb
 AUX scapy-1.1.1-config-file.patch 417 RMD160 57a6052b534ec4cab472196ce910789ef19c9697 SHA1 27ff9ba71624093836391238623c706c29756f08 SHA256 203709d462ce5d828169d613b7280e7bc78413cf8512b933fdc1d91194738e33
 DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
 DIST scapy-2.0.0.11.tar.gz 182719 RMD160 59011e3f040e4f4e23a704c2b5552c1ce401160c SHA1 15613002902eacc008247baa16cadde877755b43 SHA256 2335b4195e3cb64970488bff6012823665ee5952075abec9fcdfa6c80729c03c
 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
-EBUILD scapy-1.1.1-r1.ebuild 1772 RMD160 12e0fca33a00069fdb3fc8a5c80090f748fe93e2 SHA1 96f838d15dc9cb8f3ad0170de697e100c283e5b5 SHA256 2d820156e9f092c1f08349ef4e7777fdafb1beb9b7552f92e71336ae76d8344f
+EBUILD scapy-1.1.1-r1.ebuild 1794 RMD160 a746540e2a377983b7265ef7430710df3263f5cf SHA1 8d9e6b03d6454c563407ea8cf050fa312df171cb SHA256 2b9bfaeeeed4ba2bc576c2cacc8f3a1d787015e2f057721843266ca2ac9b1ca1
 EBUILD scapy-2.0.0.11.ebuild 850 RMD160 174a93f4dfdb552c0d4ddc3583dc79e23476e0cc SHA1 5f007acfb56cb6ebec77fbc71fc974eccdf00053 SHA256 186c1c721ac6e11b96e1c43f20d6c2de55802deeec62adb62db521593d243d2d
 EBUILD scapy-2.0.1.ebuild 847 RMD160 72c908b2cd27146e111a25503017fd0e9d0bcb9c SHA1 9ea436b9dc6dda42fd7b3dc218a7313e4e79c4fd SHA256 8bc8817ff3accf1d3b5297ade73269d99fa00eed2609c452d22e92d7290b8a04
 EBUILD scapy-2.1.0.ebuild 847 RMD160 8db9532c7dfcbc8f658ec95b2b55778202485017 SHA1 069bc0d0c6a0cd3d232eb72e7433dedc37f367c2 SHA256 cfabd151849b8745ef1848f1ab82b19585564ba429608357fa1633b761f228f4
-MISC ChangeLog 3719 RMD160 dbc3c68b5d8d15a44162cc6477bbc03736555a78 SHA1 e3e69f32092206cff8ce8d5efc9abaa8cbce0ac7 SHA256 49e901a18b576efc6450105d1f356af3b3fb8ca83ee26dc94313cd474d726b02
+MISC ChangeLog 3866 RMD160 ce82c9325a41356bb4120a4d6b03f47a3ecc75da SHA1 336942f7fa80c623513ad753d0b59093153ba268 SHA256 febd9e7c5e7eed46ee23730a60780d76fe1cd50143965339b13a5b815e4dcd4e
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkswLFoACgkQu7rWomwgFXpPYwCdGQnZWNV1y9tQfr8cBK3UFrAq
-te0An2wzTd/5uVjd/lzKcrUSlVGIKViT
-=dpOE
------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 6e504d962919..48c8ec78627e 100644
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4 2009/11/20 12:57:57 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.5 2010/05/31 16:57:46 arfrever Exp $
 
 inherit eutils python multilib
 
@@ -35,8 +35,7 @@ src_install() {
 	newexe scapy.py scapy
 
 	# also install scapy as a importable python module
-	python_version
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
+	insinto $(python_get_sitedir)
 	doins scapy.py
 
 	insinto /etc
@@ -46,7 +45,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize
+	python_mod_optimize $(python_get_sitedir)/scapy.py
 
 	einfo ""
 	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
@@ -59,5 +58,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/scapy.py
 }