Bump scapy ebuild EAPI to 2 to fix bug 314351.

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

7 files changed, 38 insertions, 50 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 65508097436c..2a41503adbcd 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.26 2011/03/13 15:32:01 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.27 2011/03/13 15:47:16 ikelos Exp $
+
+  13 Mar 2011; Mike Auty <ikelos@gentoo.org> scapy-1.1.1-r1.ebuild,
+  -scapy-2.0.0.11.ebuild, scapy-2.0.1.ebuild, scapy-2.1.0.ebuild,
+  scapy-2.2.0.ebuild:
+  Bump scapy ebuild EAPI to 2 to fix bug 314351.
 
 *scapy-2.2.0 (13 Mar 2011)
 
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 82e8752958c8..bbc192401fdc 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -4,21 +4,19 @@ 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
 DIST scapy-2.2.0.tar.gz 972996 RMD160 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e SHA1 ae0a9947a08a01a84abde9db12fed074ac888e47 SHA256 c5363b224df0efbd78d7dc4d8a518e5518b2e7affc2e5f1fcecd4efa3ab815af
-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
-EBUILD scapy-2.2.0.ebuild 870 RMD160 1c17b0964221bf92243c113dde61f1a56752f538 SHA1 c1d4de340a3ad0d0e3a8adfab3a1b6961ce45294 SHA256 ae11863d0dd421d63e204bcf5c4c78aabe02aa97bba074abf19258b42ada51c0
-MISC ChangeLog 3982 RMD160 bec93649da42c8aff9ddf79fba9e85a91d462e7c SHA1 879122748b27675cdf6cb1d2a3feeb1c2b4423c4 SHA256 8817085a20fe52750d6dac767d17cc1576e9fc929664abd7498ac68eeb60f045
+EBUILD scapy-1.1.1-r1.ebuild 1829 RMD160 9ce652328cc533496ae7d08d0b2b41bb69623f5f SHA1 fcf2c92e78b7e194635199bd94527e8b3f621df7 SHA256 4ea39a032df8c009f8fb84399c6c0c119620b85e612ef7827d4dfaf4796aea3b
+EBUILD scapy-2.0.1.ebuild 908 RMD160 a03c94339095d077b8c90822ac3aa48bae0c0646 SHA1 3282292dc7b37ab605300e9a9a58d191cd2d9b52 SHA256 4859f783a5353e0d13b5812ad3fc5758fba59221e6ea7182e71b842331c9e85f
+EBUILD scapy-2.1.0.ebuild 908 RMD160 61667e7d3e6273046934a0fcff0d8a379576c634 SHA1 b65adab7650cfdd9f9fd0a06b0a1395387a6d8ac SHA256 1e3ed1f212a288a90bf20e506d8ac15e3c8f4f134fa8880a0977f3b2b67773c8
+EBUILD scapy-2.2.0.ebuild 931 RMD160 92be6370719c2bf337160cf5e9b3ff08ae7ae7d3 SHA1 c28284fa80edd7154cbb348be82c8ca5c4127577 SHA256 8f65a3be475a35a94df37462faa6d824d704a7c20235e1120b983285bc7a5c6c
+MISC ChangeLog 4188 RMD160 4aee38a582da70e116a9eb927aea215646e6eb86 SHA1 88b0b0d37575c6562e2e392d88cb6baff0932c7c SHA256 0c61a5e4264dc2d86e3fe4f9bf13c2a43d0a30b6be0f6c0bd8ee82416743d344
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1843YACgkQu7rWomwgFXrZRACfUyf+wYkbAY4Coh3aWehaPj/y
-rGEAnjX7Vc0hawIzNCTCCOFIWuzr3C48
-=oEUq
+iEYEARECAAYFAk185woACgkQu7rWomwgFXozlACfUCz5jfdEEXlmnHEihGE0OTDQ
+XbIAoIv7d1zulWhKVsVROKji435S3742
+=ZKoT
 -----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 48c8ec78627e..06e504d1a3f8 100644
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5 2010/05/31 16:57:46 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.6 2011/03/13 15:47:16 ikelos Exp $
+
+EAPI="2"
 
 inherit eutils python multilib
 
@@ -19,14 +21,12 @@ RDEPEND="net-analyzer/tcpdump
 	pyx? ( dev-python/pyx )
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( || ( media-gfx/imagemagick
+						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-config-file.patch
 }
 
diff --git a/net-analyzer/scapy/scapy-2.0.0.11.ebuild b/net-analyzer/scapy/scapy-2.0.0.11.ebuild
deleted file mode 100644
index 1c9a112395ae..000000000000
--- a/net-analyzer/scapy/scapy-2.0.0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.0.11.ebuild,v 1.2 2009/11/20 12:57:57 ikelos Exp $
-
-inherit distutils
-
-DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
-HOMEPAGE="http://www.secdev.org/projects/scapy/"
-SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay"
-
-DEPEND="virtual/python"
-RDEPEND="net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )"
diff --git a/net-analyzer/scapy/scapy-2.0.1.ebuild b/net-analyzer/scapy/scapy-2.0.1.ebuild
index 0fdf1f3b1ca8..f54f30bec252 100644
--- a/net-analyzer/scapy/scapy-2.0.1.ebuild
+++ b/net-analyzer/scapy/scapy-2.0.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.2 2009/11/20 12:57:57 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.0.1.ebuild,v 1.3 2011/03/13 15:47:16 ikelos Exp $
+
+EAPI="2"
 
 inherit distutils
 
@@ -19,6 +21,7 @@ RDEPEND="net-analyzer/tcpdump
 	pyx? ( dev-python/pyx )
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( || ( media-gfx/imagemagick
+						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"
diff --git a/net-analyzer/scapy/scapy-2.1.0.ebuild b/net-analyzer/scapy/scapy-2.1.0.ebuild
index 6dc27d337813..63b51495746b 100644
--- a/net-analyzer/scapy/scapy-2.1.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.1.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1 2009/12/22 02:17:49 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.1.0.ebuild,v 1.2 2011/03/13 15:47:16 ikelos Exp $
+
+EAPI="2"
 
 inherit distutils
 
@@ -19,6 +21,7 @@ RDEPEND="net-analyzer/tcpdump
 	pyx? ( dev-python/pyx )
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( || ( media-gfx/imagemagick
+						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"
diff --git a/net-analyzer/scapy/scapy-2.2.0.ebuild b/net-analyzer/scapy/scapy-2.2.0.ebuild
index 7e4486746017..c5031e565c72 100644
--- a/net-analyzer/scapy/scapy-2.2.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0.ebuild
@@ -1,6 +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.1 2011/03/13 15:32:01 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-2.2.0.ebuild,v 1.2 2011/03/13 15:47:16 ikelos Exp $
+
+EAPI="2"
 
 PYTHON_DEPEND="2:2.6"
 
@@ -21,6 +23,7 @@ RDEPEND="net-analyzer/tcpdump
 	pyx? ( dev-python/pyx )
 	crypt? ( dev-python/pycrypto )
 	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( || ( media-gfx/imagemagick
+						media-gfx/graphicsmagick[imagemagick] ) )
 	visual? ( dev-python/visual )
 	tcpreplay? ( net-analyzer/tcpreplay )"