cleanup

Package-Manager: portage-2.1.2.12

12 files changed, 10 insertions, 316 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 5436e759e4a1..50a2405cfeda 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.12 2007/08/27 13:41:52 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.13 2007/09/09 11:08:44 lcars Exp $
+
+  09 Sep 2007; Andrea Barisani <lcars@gentoo.org> -scapy-1.0.2.ebuild,
+  -scapy-1.0.2-r1.ebuild, -scapy-1.0.3.ebuild, -scapy-1.0.3-r1.ebuild,
+  -scapy-1.0.4.ebuild:
+  Cleanup, bug #191518.
 
 *scapy-1.1.1 (27 Aug 2007)
 
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 7e678cfc9588..4381b47f9529 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,31 +2,8 @@ AUX ethertypes 1317 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 SHA1 6ed0fe2
 MD5 94bffde8f75a1b8f891fb780bfe15ca2 files/ethertypes 1317
 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 files/ethertypes 1317
 SHA256 e140071e462df8aab9f7b63a3965bf206797ecbcff334a3ec494256defe35dcb files/ethertypes 1317
-DIST scapy-1.0.2.tar.gz 104563 RMD160 9dd73fc4265467e84e1080bf7bfa8875aee32b96 SHA1 4c2c90a47e743ff7122216cff2929cba521f4198 SHA256 e71c6917f00ed0269144680029ea3270650ee1a6200f32e1ffe1c8b958da0293
-DIST scapy-1.0.3.tar.gz 125145 RMD160 3c7f5537ad9e8d3380e27323a4842bcf08b076bf SHA1 c8c9b481d2f44e712d40efe5878dbd86bc4bbd90 SHA256 f7f5626cafe4354a298937de65107260b67668c21706361913b2db99d08ce458
-DIST scapy-1.0.4.tar.gz 132677 RMD160 2618548042f65b0d02461623fece93d4c2588959 SHA1 abe7cc242af4f20ef016557800e2e521c2e14a1b SHA256 340bebb26bbf8cb37bdbcfb7b8df9225ad384a0b3f0b33b55ca0b8ba6c9a3b02
 DIST scapy-1.0.5.tar.gz 144746 RMD160 33bbc31385ca098b1361d8233f17222fa460836f SHA1 58ab1ef469d48a84fe987a3a91d6e40a59bb687d SHA256 a8a77854dfdc6cee71344527510e64d1985222d20637c08f0b46b8d709c2e766
 DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
-EBUILD scapy-1.0.2-r1.ebuild 1580 RMD160 84fbf939787ffc42ba03ff29b02fedc49af93cd7 SHA1 c4b3e5ad0ad62a4474b999be2d277dedc88df589 SHA256 03beba5f1d5582fb8b8a1fd59252d938a60a09c677c3ddd5a3d9851620d2f11b
-MD5 25ccc0be5ff2d7c0539def982c72e1d5 scapy-1.0.2-r1.ebuild 1580
-RMD160 84fbf939787ffc42ba03ff29b02fedc49af93cd7 scapy-1.0.2-r1.ebuild 1580
-SHA256 03beba5f1d5582fb8b8a1fd59252d938a60a09c677c3ddd5a3d9851620d2f11b scapy-1.0.2-r1.ebuild 1580
-EBUILD scapy-1.0.2.ebuild 1359 RMD160 b2ea2d3913241ef1c52472fc4eed39bf832e29b8 SHA1 5ea3ec80105605e3a2c85ea4ef2bbefc9d17664e SHA256 18366e344691a72f89429d9eaed2067c56a176f4a4a75cdacaf26edead61a7f9
-MD5 f7b6d1d2a9053cba45e52341a0a4d424 scapy-1.0.2.ebuild 1359
-RMD160 b2ea2d3913241ef1c52472fc4eed39bf832e29b8 scapy-1.0.2.ebuild 1359
-SHA256 18366e344691a72f89429d9eaed2067c56a176f4a4a75cdacaf26edead61a7f9 scapy-1.0.2.ebuild 1359
-EBUILD scapy-1.0.3-r1.ebuild 1599 RMD160 51525d089ce229ce828a49b0705709c07c1b8077 SHA1 840dd5a12af0771943947473e18ae72edcb32de6 SHA256 ee84355e9b06fcbf94c9ffa41c193b05141beaa0e9b13d79dd7d9a5cd34a51cc
-MD5 53f42e947fbac88fa5cfba8898adcbdb scapy-1.0.3-r1.ebuild 1599
-RMD160 51525d089ce229ce828a49b0705709c07c1b8077 scapy-1.0.3-r1.ebuild 1599
-SHA256 ee84355e9b06fcbf94c9ffa41c193b05141beaa0e9b13d79dd7d9a5cd34a51cc scapy-1.0.3-r1.ebuild 1599
-EBUILD scapy-1.0.3.ebuild 1577 RMD160 2462a205c4460c37b477a28971ca67c7b7b4e642 SHA1 991c07aa13ca561f76797657404d1c666309975f SHA256 a04b1644365e72fbe18ce9a42c2cd73eb6a48e834a282472839653d65e17083c
-MD5 0ef377e5474343953678154bc697308c scapy-1.0.3.ebuild 1577
-RMD160 2462a205c4460c37b477a28971ca67c7b7b4e642 scapy-1.0.3.ebuild 1577
-SHA256 a04b1644365e72fbe18ce9a42c2cd73eb6a48e834a282472839653d65e17083c scapy-1.0.3.ebuild 1577
-EBUILD scapy-1.0.4.ebuild 1626 RMD160 41466207c6d0fc99b5c40907d38a96706cfce239 SHA1 711e3a5960963fa23b80c09b738cd6c82e457f51 SHA256 f307da3f85bcdfb292c4c9860f6418cd1bc6188b7403fd617d56692100e2db87
-MD5 8272428871df210f333419940f494740 scapy-1.0.4.ebuild 1626
-RMD160 41466207c6d0fc99b5c40907d38a96706cfce239 scapy-1.0.4.ebuild 1626
-SHA256 f307da3f85bcdfb292c4c9860f6418cd1bc6188b7403fd617d56692100e2db87 scapy-1.0.4.ebuild 1626
 EBUILD scapy-1.0.5.ebuild 1635 RMD160 88ef4c60234b601acac824ba91a54bb216acb0d0 SHA1 cc56460b0647b9286ed91729b150e652ada378ae SHA256 cec8c431452e26a09ec8384312a51bc6811424dc0ff22e54cdb16911ef4f9230
 MD5 3c55e8847efd76abed194e0252d20854 scapy-1.0.5.ebuild 1635
 RMD160 88ef4c60234b601acac824ba91a54bb216acb0d0 scapy-1.0.5.ebuild 1635
@@ -35,29 +12,14 @@ EBUILD scapy-1.1.1.ebuild 1635 RMD160 35e66e9cf0a1f01401386b8e96cad930999ee943 S
 MD5 394c1589f6bb018e31fc1561cd475bef scapy-1.1.1.ebuild 1635
 RMD160 35e66e9cf0a1f01401386b8e96cad930999ee943 scapy-1.1.1.ebuild 1635
 SHA256 90cd6ad1f0a7e7a069e0d1ffa796c5944f557ac762b81cea8f7672ea277880bc scapy-1.1.1.ebuild 1635
-MISC ChangeLog 1612 RMD160 efd93db8801b28531d228cf4c6658006116c4999 SHA1 5064975d53177caa606fd3240aea1bb18f470d28 SHA256 b130e32501675673a66e06c9496700dc9251d3c95111f61fd792654f461ea9d4
-MD5 a2cc885a54ca94d26d19630101973d62 ChangeLog 1612
-RMD160 efd93db8801b28531d228cf4c6658006116c4999 ChangeLog 1612
-SHA256 b130e32501675673a66e06c9496700dc9251d3c95111f61fd792654f461ea9d4 ChangeLog 1612
+MISC ChangeLog 1802 RMD160 4a95029537dad52ae424c89ad9e27e246dcbc0f7 SHA1 4e8ebc4b10faf4788262997ae64c7f78471e03f0 SHA256 e8e31ee5e94350a24eaac7a73bd8d21a93879f7845f1d9bf442b373fb299198e
+MD5 64a0b0b6cdad9da6fef9988bcaf2d406 ChangeLog 1802
+RMD160 4a95029537dad52ae424c89ad9e27e246dcbc0f7 ChangeLog 1802
+SHA256 e8e31ee5e94350a24eaac7a73bd8d21a93879f7845f1d9bf442b373fb299198e ChangeLog 1802
 MISC metadata.xml 355 RMD160 688a1f9880c088ac5da974b5a3822b394a7451c3 SHA1 727498ee2bb84d7c13392f3fac0357423fe18f76 SHA256 162295dcb18fa7d4f77dbee062aa50203c6feeb46db8e47660c33e22882f1287
 MD5 c0cf59a965bb4c8fb3fba2080d854821 metadata.xml 355
 RMD160 688a1f9880c088ac5da974b5a3822b394a7451c3 metadata.xml 355
 SHA256 162295dcb18fa7d4f77dbee062aa50203c6feeb46db8e47660c33e22882f1287 metadata.xml 355
-MD5 5e677c151d35ed7016470b2034f1e778 files/digest-scapy-1.0.2 235
-RMD160 9bb09313215b4c2830c5f18389fc69f8bf6abd12 files/digest-scapy-1.0.2 235
-SHA256 a2ea8f5ad1f3a7761c55695a4487a04aa8f1a54664f6926bb8f42f1cbbe5ca5a files/digest-scapy-1.0.2 235
-MD5 5e677c151d35ed7016470b2034f1e778 files/digest-scapy-1.0.2-r1 235
-RMD160 9bb09313215b4c2830c5f18389fc69f8bf6abd12 files/digest-scapy-1.0.2-r1 235
-SHA256 a2ea8f5ad1f3a7761c55695a4487a04aa8f1a54664f6926bb8f42f1cbbe5ca5a files/digest-scapy-1.0.2-r1 235
-MD5 84452769f224e0d6b6fc9d8ef6b6f26e files/digest-scapy-1.0.3 235
-RMD160 b7293b7e14b1374e6b8b8ca86f1cba3365f8a3c0 files/digest-scapy-1.0.3 235
-SHA256 c98b6c3665fb222e1fff991671919b58db325f98175671f4721f72199d5cbfd7 files/digest-scapy-1.0.3 235
-MD5 84452769f224e0d6b6fc9d8ef6b6f26e files/digest-scapy-1.0.3-r1 235
-RMD160 b7293b7e14b1374e6b8b8ca86f1cba3365f8a3c0 files/digest-scapy-1.0.3-r1 235
-SHA256 c98b6c3665fb222e1fff991671919b58db325f98175671f4721f72199d5cbfd7 files/digest-scapy-1.0.3-r1 235
-MD5 21894ed6a266a35a04782da1fe906efa files/digest-scapy-1.0.4 235
-RMD160 6e39c10df5c7e513408a2cc6ddc73efb599fa3ca files/digest-scapy-1.0.4 235
-SHA256 82db20e23ec84cd8fc97d6b6327a10f8077f64e87f62e08c9a86f09716f0c85f files/digest-scapy-1.0.4 235
 MD5 9c16b3851b1c2c3dedf097fde9d2e0fd files/digest-scapy-1.0.5 235
 RMD160 9fc01e44cbcb17b71abb9ba1b7b2af87bfb1f306 files/digest-scapy-1.0.5 235
 SHA256 651f6a943e5604a7444256340a48498c8d52e93d2bf5beb0c54fa3fe6a34e1f7 files/digest-scapy-1.0.5 235
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.2 b/net-analyzer/scapy/files/digest-scapy-1.0.2
deleted file mode 100644
index ffe32870c486..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4cac0a657079492710b31a6aed0672a scapy-1.0.2.tar.gz 104563
-RMD160 9dd73fc4265467e84e1080bf7bfa8875aee32b96 scapy-1.0.2.tar.gz 104563
-SHA256 e71c6917f00ed0269144680029ea3270650ee1a6200f32e1ffe1c8b958da0293 scapy-1.0.2.tar.gz 104563
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.2-r1 b/net-analyzer/scapy/files/digest-scapy-1.0.2-r1
deleted file mode 100644
index ffe32870c486..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4cac0a657079492710b31a6aed0672a scapy-1.0.2.tar.gz 104563
-RMD160 9dd73fc4265467e84e1080bf7bfa8875aee32b96 scapy-1.0.2.tar.gz 104563
-SHA256 e71c6917f00ed0269144680029ea3270650ee1a6200f32e1ffe1c8b958da0293 scapy-1.0.2.tar.gz 104563
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.3 b/net-analyzer/scapy/files/digest-scapy-1.0.3
deleted file mode 100644
index 85ecbd4c5c50..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bdc5247105312c61597d5c3e00dc1127 scapy-1.0.3.tar.gz 125145
-RMD160 3c7f5537ad9e8d3380e27323a4842bcf08b076bf scapy-1.0.3.tar.gz 125145
-SHA256 f7f5626cafe4354a298937de65107260b67668c21706361913b2db99d08ce458 scapy-1.0.3.tar.gz 125145
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.3-r1 b/net-analyzer/scapy/files/digest-scapy-1.0.3-r1
deleted file mode 100644
index 85ecbd4c5c50..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bdc5247105312c61597d5c3e00dc1127 scapy-1.0.3.tar.gz 125145
-RMD160 3c7f5537ad9e8d3380e27323a4842bcf08b076bf scapy-1.0.3.tar.gz 125145
-SHA256 f7f5626cafe4354a298937de65107260b67668c21706361913b2db99d08ce458 scapy-1.0.3.tar.gz 125145
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.4 b/net-analyzer/scapy/files/digest-scapy-1.0.4
deleted file mode 100644
index 64695b7d697d..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c156668cfab4c1fde276f81e0b85b5d9 scapy-1.0.4.tar.gz 132677
-RMD160 2618548042f65b0d02461623fece93d4c2588959 scapy-1.0.4.tar.gz 132677
-SHA256 340bebb26bbf8cb37bdbcfb7b8df9225ad384a0b3f0b33b55ca0b8ba6c9a3b02 scapy-1.0.4.tar.gz 132677
diff --git a/net-analyzer/scapy/scapy-1.0.2-r1.ebuild b/net-analyzer/scapy/scapy-1.0.2-r1.ebuild
deleted file mode 100644
index 4ec471bcf7ef..000000000000
--- a/net-analyzer/scapy/scapy-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.0.2-r1.ebuild,v 1.1 2005/12/18 11:25:50 lcars Exp $
-
-inherit python
-
-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="~x86 ~ppc"
-IUSE="gnuplot pyx crypt graphviz imagemagick"
-
-DEPEND="virtual/python
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )"
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	# also install scapy as a importable python module
-	python_version
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins scapy.py
-
-	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
-
-pkg_postinst() {
-	python_mod_optimize
-
-	einfo ""
-	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
-	einfo ""
-	einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org"
-	einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org"
-	einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general"
-	einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general"
-	einfo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/net-analyzer/scapy/scapy-1.0.2.ebuild b/net-analyzer/scapy/scapy-1.0.2.ebuild
deleted file mode 100644
index aa4580869a81..000000000000
--- a/net-analyzer/scapy/scapy-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.0.2.ebuild,v 1.3 2005/11/21 08:19:09 lcars Exp $
-
-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="~x86 ~ppc"
-IUSE="gnuplot pyx crypt graphviz imagemagick"
-
-DEPEND="virtual/python
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )"
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
-
-pkg_postinst() {
-	einfo ""
-	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
-	einfo ""
-	einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org"
-	einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org"
-	einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general"
-	einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general"
-	einfo ""
-}
diff --git a/net-analyzer/scapy/scapy-1.0.3-r1.ebuild b/net-analyzer/scapy/scapy-1.0.3-r1.ebuild
deleted file mode 100644
index f52e94a6840c..000000000000
--- a/net-analyzer/scapy/scapy-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.0.3-r1.ebuild,v 1.2 2006/04/01 14:58:56 deltacow Exp $
-
-inherit python multilib
-
-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 ~ppc ~x86"
-IUSE="gnuplot pyx crypt graphviz imagemagick"
-
-DEPEND="virtual/python
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )"
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	# also install scapy as a importable python module
-	python_version
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins scapy.py
-
-	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
-
-pkg_postinst() {
-	python_mod_optimize
-
-	einfo ""
-	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
-	einfo ""
-	einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org"
-	einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org"
-	einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general"
-	einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general"
-	einfo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/net-analyzer/scapy/scapy-1.0.3.ebuild b/net-analyzer/scapy/scapy-1.0.3.ebuild
deleted file mode 100644
index 8f9e87899ef3..000000000000
--- a/net-analyzer/scapy/scapy-1.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.0.3.ebuild,v 1.1 2006/02/21 11:57:44 lcars Exp $
-
-inherit python
-
-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="~x86 ~ppc"
-IUSE="gnuplot pyx crypt graphviz imagemagick"
-
-DEPEND="virtual/python
-	net-analyzer/tcpdump
-	gnuplot? ( dev-python/gnuplot-py )
-	pyx? ( dev-python/pyx )
-	crypt? ( dev-python/pycrypto )
-	graphviz? ( media-gfx/graphviz )
-	imagemagick? ( media-gfx/imagemagick )"
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	# also install scapy as a importable python module
-	python_version
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins scapy.py
-
-	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
-
-pkg_postinst() {
-	python_mod_optimize
-
-	einfo ""
-	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
-	einfo ""
-	einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org"
-	einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org"
-	einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general"
-	einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general"
-	einfo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/net-analyzer/scapy/scapy-1.0.4.ebuild b/net-analyzer/scapy/scapy-1.0.4.ebuild
deleted file mode 100644
index c6cd27caf542..000000000000
--- a/net-analyzer/scapy/scapy-1.0.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.0.4.ebuild,v 1.2 2006/09/24 10:12:51 blubb Exp $
-
-inherit python multilib
-
-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"
-
-DEPEND="virtual/python
-	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 )"
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	# also install scapy as a importable python module
-	python_version
-	insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-	doins scapy.py
-
-	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
-
-pkg_postinst() {
-	python_mod_optimize
-
-	einfo ""
-	einfo "- Check http://www.secdev.org/projects/scapy/ for additional info"
-	einfo ""
-	einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org"
-	einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org"
-	einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general"
-	einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general"
-	einfo ""
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}