Remove old versions, fixes bugs 419811 and 419813.

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

6 files changed, 11 insertions, 152 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 108b9b9c9081..c259cb9ecf7b 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.35 2012/01/28 15:34:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.36 2012/06/06 00:09:40 ikelos Exp $
+
+  06 Jun 2012; Mike Auty <ikelos@gentoo.org> -scapy-1.1.1-r1.ebuild,
+  -files/scapy-1.1.1-config-file.patch, -scapy-2.0.1.ebuild, -files/ethertypes:
+  Remove old versions, fixes bugs 419811 and 419813.
 
   28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> scapy-2.2.0-r1.ebuild:
   x86 stable wrt bug #400427
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index e85e7dfa382c..0ead952509be 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
 AUX scapy-2.2.0-fix-sendpfast.patch 502 RMD160 23843e84d2ca2848b77af3392911916c109fb4d7 SHA1 e12e9204898ab18025545508fdda18eaf83e05c9 SHA256 696eb6799c6eec5c15bf5b3c8fa5c73ebd1a926f1e5db6f62807291b3d18db85
-DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
-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 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 977 RMD160 9e8737fc2420c60e9a48b5b21024b3afb415ae57 SHA1 cb790437f4f35ab83b53e21482adb0386d462a6a SHA256 395b125e990d4b02d4a8fa853061e551bec9f702658d1b2f800342046cff72f2
 EBUILD scapy-2.2.0-r1.ebuild 1059 RMD160 201db0e587b40cdc6438d426014b4d326b41b254 SHA1 c53f0ee49e8734e4186b5be9ff6cb299b1705147 SHA256 563aef41391928cbf46755784798bcfe16f8bd90c5fd4f9e215d287afdfdf9ec
 EBUILD scapy-2.2.0.ebuild 983 RMD160 aa9febf38c98c7842a56164f73e69c6eab6e931e SHA1 d18e187a560418f04ffcbcc01ae1a3ba7f4ec757 SHA256 565a1c05240dce358150bbf2f4cce69047ac3ea311961936cddfffbe619ff80b
-MISC ChangeLog 5347 RMD160 14d867b413c0a6698fe44f8df9d884322246d5f2 SHA1 471da961c61a7d1314f9fc517926bffc951dd92d SHA256 f42d5df33c953350546eaf0aa5a32f3e3a0d0a31de05e64c7046b60ea8f9b394
+MISC ChangeLog 5546 RMD160 fb8f5937596ade2a0bcae918580dfdbf827408b3 SHA1 faa3a8dc2a7b8a768424d3002656dbbf7a29e29e SHA256 ef4f6a662190926e2f03da3342e6ef62d4070b1f7cc75bbcb52b04020c9f6d97
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAk8kFXYACgkQuUQtlDBCeQKTaQCeIEMIRdu70ZE4ZbeYhTVn0ceH
-wgoAn00iDXQpj7AVPCXHZY4CtHr6kRTa
-=7ayM
+iEYEARECAAYFAk/On8kACgkQu7rWomwgFXoYlgCgrQC2GqeA4IRtW10SHWnRcECi
+q2wAoKFRFXFXkNQHj+4dWrkwQ7rKwxr1
+=CUjW
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scapy/files/ethertypes b/net-analyzer/scapy/files/ethertypes
deleted file mode 100644
index 5e700f663987..000000000000
--- a/net-analyzer/scapy/files/ethertypes
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Ethernet frame types
-#		This file describes some of the various Ethernet
-#		protocol types that are used on Ethernet networks.
-#
-# This list could be found on:
-#         http://www.iana.org/assignments/ethernet-numbers
-#
-# <name>    <hexnumber> <alias1>...<alias35> #Comment
-#
-IPv4	 	0800  	ip ip4 		# Internet IP (IPv4)
-X25		0805
-ARP		0806	ether-arp	#
-FR_ARP		0808    		# Frame Relay ARP        [RFC1701]
-BPQ		08FF			# G8BPQ AX.25 Ethernet Packet
-DEC		6000			# DEC Assigned proto
-DNA_DL		6001			# DEC DNA Dump/Load
-DNA_RC		6002			# DEC DNA Remote Console
-DNA_RT		6003			# DEC DNA Routing
-LAT		6004			# DEC LAT
-DIAG		6005			# DEC Diagnostics
-CUST		6006			# DEC Customer use
-SCA		6007			# DEC Systems Comms Arch
-TEB		6558             	# Trans Ether Bridging   [RFC1701]
-RAW_FR  	6559                   	# Raw Frame Relay        [RFC1701]
-AARP		80F3			# Appletalk AARP
-ATALK		809B                  	# Appletalk
-802_1Q		8100	8021q 1q 802.1q	dot1q # 802.1Q Virtual LAN tagged frame
-IPX		8137			# Novell IPX
-NetBEUI		8191			# NetBEUI
-IPv6		86DD	ip6 		# IP version 6
-PPP		880B                    # PPP
-ATMMPOA		884C			# MultiProtocol over ATM
-PPP_DISC	8863			# PPPoE discovery messages
-PPP_SES		8864			# PPPoE session messages
-ATMFATE		8884			# Frame-based ATM Transport over Ethernet
-LOOP		9000	loopback 	# loop proto
diff --git a/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch b/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch
deleted file mode 100644
index ac38942b52e5..000000000000
--- a/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://hg.secdev.org/scapy/rev/443b35c8c6de
-
-Fixed startup config file reading problem when scapy is used as a library
-
---- scapy.py.orig	2008-01-30 19:47:55.000000000 +0300
-+++ scapy.py	2008-01-30 19:48:42.000000000 +0300
-@@ -12190,4 +12190,5 @@
- if __name__ == "__main__":
-     interact()
- else:
--    read_config_file(DEFAULT_CONFIG_FILE)
-+    if DEFAULT_CONFIG_FILE:
-+        read_config_file(DEFAULT_CONFIG_FILE)
diff --git a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
deleted file mode 100644
index 6e79479bf4aa..000000000000
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.8 2011/04/05 17:28:33 arfrever Exp $
-
-EAPI="3"
-
-inherit eutils 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 tcpreplay"
-
-DEPEND="dev-lang/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
-						media-gfx/graphicsmagick[imagemagick] ) )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-config-file.patch
-}
-
-src_install() {
-	exeinto /usr/bin
-	newexe scapy.py scapy
-
-	# also install scapy as a importable python module
-	insinto $(python_get_sitedir)
-	doins scapy.py
-
-	insinto /etc
-	doins "${FILESDIR}"/ethertypes
-	dodoc AUTHORS README changelog.txt
-	doman scapy.1
-}
-
-pkg_postinst() {
-	python_mod_optimize scapy.py
-
-	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 scapy.py
-}
diff --git a/net-analyzer/scapy/scapy-2.0.1.ebuild b/net-analyzer/scapy/scapy-2.0.1.ebuild
deleted file mode 100644
index c36f71e77a0d..000000000000
--- a/net-analyzer/scapy/scapy-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.5 2011/04/05 17:28:33 arfrever Exp $
-
-EAPI="3"
-
-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="dev-lang/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
-						media-gfx/graphicsmagick[imagemagick] ) )
-	visual? ( dev-python/visual )
-	tcpreplay? ( net-analyzer/tcpreplay )"