use esvn_clean; clean die usage; drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 62 insertions, 238 deletions

diff --git a/net-analyzer/w3af/ChangeLog b/net-analyzer/w3af/ChangeLog
index 060ab0f12414..dbd2998f8190 100644
--- a/net-analyzer/w3af/ChangeLog
+++ b/net-analyzer/w3af/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/w3af
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.20 2014/12/31 05:00:41 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/ChangeLog,v 1.21 2015/03/21 14:46:10 jlec Exp $
+
+  21 Mar 2015; Justin Lecher <jlec@gentoo.org> -w3af-1.0.ebuild,
+  -w3af-1.0_rc5-r1.ebuild, -w3af-1.1.ebuild, w3af-1.1-r1.ebuild,
+  w3af-1.5.ebuild:
+  use esvn_clean; clean die usage; drop old
 
   31 Dec 2014; Mike Gilbert <floppym@gentoo.org> w3af-1.1-r1.ebuild,
   w3af-1.5.ebuild:
diff --git a/net-analyzer/w3af/Manifest b/net-analyzer/w3af/Manifest
index 462058883700..983bb7148bb6 100644
--- a/net-analyzer/w3af/Manifest
+++ b/net-analyzer/w3af/Manifest
@@ -1,24 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX use_simplejson_instead_of_jsonpy.patch 3622 SHA256 5a15a6d6ce05466ac13ae4490e36bbaebf3dc25a72d75a5c9cfebe839acb715a SHA512 1ac0e94d3d8abd22c61ccb72d5a2c3f4151fc49f6c9fc1c029c239584c6ca67ac0a1e6073eab70b0bf142e30c3623dee89bee3efa5c9cefed40a7ea517b59ca3 WHIRLPOOL f00f6df130845225b702e7ebda79d61c909a5a2d89e245c02e63ebaa6e5f8e76867efa22e3055b9753ff7a0a578999856c9fc1be28ff82dc28c5bdc1d32a0bbb
 AUX w3af_console 45 SHA256 baec5ace41ba0ff29b792dd288ee9a14eef83546af633620125644ad29fd19c7 SHA512 e8353393663d892f0f362a03e9459383cb8cf2de87a4bdd135f6c7fbc289cc34a236abf514dcfb9d9a3c573e2e5747c06c819527b1b0051c9513130cd0047a21 WHIRLPOOL 4b61760caf06b8df3cf1fb3d220c990efc72ea1de1f03ebe875e75f71904037006de6e3470f30f9607c6343ff0130b08622523a34bac822ddc084f43a6b0137f
 AUX w3af_gui 41 SHA256 12f98d26f6c844b74e9d12a4df12ac8430eeb627dd15e8452e37202d254dda69 SHA512 1fd52f555d9fe3ebf7c8a985d83e7f86eb6e9a379589c50c567ed12c54abb63125ccd21b028215a87acb533aa45ec8fd8dc3169a3c9cbe090b8d32f2a9b751ca WHIRLPOOL af264d9b03b34c97a09ff7bafe44f041b07a044bdd47ece3095353c1155bbf57c5cf055f0a0e8d1c8242ed4270ba1822ae264fb0c1f4d987e81713184810f29c
 DIST 1.5.tar.gz 31147412 SHA256 ce3ac0c5a1c1ae4f8aba012619e400558bf33b77080af61a9756d615883c523f SHA512 5b0b83e36b35883bd78fe990e9e5f0c955e49a22421d8eee4ec877cda842e79c8af0b490f0927ea253bdd60b957fbacf7ad1116e2c3d93023f160691aa50ce7e WHIRLPOOL 79662c1bbf05b825aa5251b43f98ebe118780d456e3dab8368d51c055792c435435cc245ec6d5f897c49a6445e90503d8917a7aa4ef3af6d87c5dcdf3a287b47
-DIST w3af-1.0-rc5.tar.bz2 40592636 SHA256 afdd6a37613b8f67cc991a864aeafc32f534399eb0c712a77d8422be363deb32
-DIST w3af-1.0-stable.tar.bz2 39909370 SHA256 9aaa651e706fe0c4c2cff95879d614cdcb9791e5120cccc527fcb82922d76fc8
 DIST w3af-1.1.tar.bz2 39994121 SHA256 0bf3cec513931b9bf20e6f753dedeaab57b5cad303489ab9ff365786c04d9444 SHA512 9a6c7d474d61f9039c150b44d4c6027451d58e925e47083262105f62b0fca718373103015e3f5bbed1cb89a40c9c057d3d54ce0c533ad3cc90e8ff24e193f868 WHIRLPOOL cb5d0d7bc9096ae27e5597e5dfd2963e03e0b7f4939fb0583ef61d2dec0c8b595ccbfb3e43f4ed170cb8ac79a74f654a5502eeb5d590138f43cfd7cdbe3e4e1f
-EBUILD w3af-1.0.ebuild 1696 SHA256 95b7157920ea78bc8936a4e02786db88909a06d054c6785417e4e1edbb5051c2 SHA512 a01d4452141c4ebf591956bdb7853a01febe8bd5d6b192eaa21bf7a75b879881275472c849ac7efa89181642f1ac99e6db75716b5c48331bd319435cea8d131a WHIRLPOOL 259af93cf59ae1a78f6fed615881a638dbc1e3ebac2ff0dccdb455be8c4f4412221d8c561a0f6e61927cc746d441442bfde8309131b64657171475effa13a32b
-EBUILD w3af-1.0_rc5-r1.ebuild 1699 SHA256 de69acd22f03951d48edd70c045b31ae0c5507741acc68f9534ae92d00cbbcd5 SHA512 3e0671832443ae6ebb7ab36e5010610f62dcb1d72bd74d71c67cf9bfb962526150806f1906674bc2676e0e40a5b27964d6e58e5743e57c71073bbb75af5876b7 WHIRLPOOL 14eeaaec6cf6f27b8f9bcee532888f01b17b01013f119f4cc8d6df5f21555ed51c54fe58a3a29a76cfbf98255ee5969dd23df2f6833f8938a0066cfcce81b0d2
-EBUILD w3af-1.1-r1.ebuild 2066 SHA256 5930ff3499939241a26897f747ff688431e4ac851da686bb47e22b8e2f056d97 SHA512 c9d7ec37554ee4159785fb295ceb9dbdcad7aa1f6bd4eb24efba4ccced0fde837f22d2490de3861e379b685ff8cf02022aa441ac30e62b2edc30fb88782d9f00 WHIRLPOOL 83a381ebe554664894ea3f2998112cd79cce8d720b76846e4b6c3896fdeefa5f264033dd7d673cc25b16bb7088ca1c4ebb0496ee2fd09f072d6936c1992b96b3
-EBUILD w3af-1.1.ebuild 1774 SHA256 6780fca758d21f12a1425ef39db294929979c3e7ddf9acdade803294cda2b042 SHA512 5dda4bc8ac14cd91177d6027cd7ad4c8424e9d7744ab1714ec4d5d24947c028689d71bd79844c292da37738a6fe157eadd433bd7c7253d9c88893c4b0f4ffbd5 WHIRLPOOL cb3c1766678b3c6c48b193e3890f48a06f46962dbc59f072fd9bfff642e030fb265884df8c06dea456b38329d84ceb55ae655ca924aaa47d86818b4bfa83ec0c
-EBUILD w3af-1.5.ebuild 2453 SHA256 7500b108969f7c8656096f815c089358c0d7304246c934588d0f1cd0f98e40e6 SHA512 6f6717b71fb83ee01b9bd4e9a4b5b89cc352d628a04853f14cc309c14458d63e5c8488c50e568db2b03605fe130355555ba1c663a4b9f7bc7e937ec86aab3ef0 WHIRLPOOL 8d8e46aae278e764a5702b12ad595cc1ac9ccf653310a64d770bfe3cd8bd6cd8f61f899085f36e0dfc8fd18b425a2f904cc3073b7c6a9bc39ce2e5d73327a09b
-MISC ChangeLog 3458 SHA256 5ec134d4c9c73fa3079a19634bd2451edd900adb8faf1c0c673528786fb94710 SHA512 72ed592c6f39c211cfb55947361a32c7fe02c1539e3ce09d9c746776dec4283fca4c470380d5e650ca18ed1bc5a60611b6dcbdcabe66c74d7ca6299843626608 WHIRLPOOL 7884a4858fd7345af3dd1f0fb503b826ef66c5d893f002bedfd75ead023b3d54089ffcd3f6fb465e76c85dfa9c99dfb75496c7b7fd8cc48411c04f48aa22d9ad
+EBUILD w3af-1.1-r1.ebuild 1981 SHA256 0fda45a4c71f68ef55345870032295bb0312577940b68086cab0b36fd99aa485 SHA512 b95eaa56622281e15b7975dac1ff6d1ebb1680f654cd1b2903767bf686a55851a91be6280f687d8a6eb645a6b2ec60e5616b4740bffa95219002fd06bded1777 WHIRLPOOL 1fe278077ee401d7d35431d92cba8bb16677fa27f8ef9bfc1418e035ae0b480915754700d44142bf787d1ea3d0a6496e285f9d0ecb54eea93f2e5ca2e434b467
+EBUILD w3af-1.5.ebuild 2425 SHA256 71263b0fbc89e3e1193b40355d5136d3f68aa0e95a68fcf11558e21efad1c894 SHA512 7cc1a25a22d85c2c730adf69f6e532a1e4b41aeacc03e7f48c85f8d8d615ee37a42c7e165ebd0680f154a608a2bd2351c75fdd8533868ed662c0d8cc43e955ac WHIRLPOOL e18b3892b6cec3058fe25bfce4bc9288e98abf9b2be4b46fdff64255c97eb5d6512a21bbd9f62fe4c0f7c3f71add6ca023a386b8260a483e4e9a0d827f5ec279
+MISC ChangeLog 3649 SHA256 61c426034940b7f98334c0788df15aed187d9c3d537339a0191568a50e651c0d SHA512 41fadf65465e3f4bd484a4161050a7877e81abdc02febebd588881788636e422eef39734e62a4fd0ac67d9b1b05c1288929cff973b30a0e88b05b6f9def70bf8 WHIRLPOOL 9fdc7b247efa56065bc98f5f00c00278795930b4b8c94eec1e778fdb652cea5ee60f4e5e78da36a44edee505d10b546128de05c083c92dea31b3a54246760c5d
 MISC metadata.xml 383 SHA256 924e05d8408c4bc609fcd5a50e482454b948c26bbd1a348949a096cb152131d2 SHA512 292e4a623a954d113b686b2dded1931d8cbd290a3655f159cef245692ad362ef17943e0816390dede21fcdedb048b4e9ee662d4ea337e44d1bcce7a7bb5e56fa WHIRLPOOL 63656a7f8559c5c5cc851d22f3fe3ea91d385c1b17a43313ec4af6e66ba2edcdc299f10396b355991d235a72d4e67f90d2cff6922af602f307cf9d0b7e6781a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlSjgvoACgkQC77qH+pIQ6S52wD8DZX0EuBUdB3Kd6psKhuo8QmO
-GCE7HmsFZBTMXvMV2ioA/AhjEdDoXQBWyYUmVkG4csmKzWjpexzYHKboZxDJgfgR
-=6083
+iQJ8BAEBCgBmBQJVDYQzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirhasP/2Te73jkd9DkqzrKvCa0b6tx
+2eyMQXO0x/J80y4n7g29nMrXFccxjns4H4jgGLQbAc9W2r2jbeB+CtH/+PPj1Op8
+8O7QfQ9U7/I4bqGyZEcNrB/425rpEodBiAO3HT1Am2A/uEH8BMKS9r4M9d3djkHI
+1Fa7lQUhEyv7ZX+jYNNv5fsOlj6s37iBRsljcHt8HzK7kldv7vPDcysxFkphfPDm
+XOknTSEnTJh3KVqhGS5rGYiTSvjS05XVZMkNX38oRiREMGzkUrcRB0RB7m0I7xuL
+4lDT+9+cruoFgbGZj7RqVFxxdtHrdh83wp8LOQzZczj+LYGmCT/PxhTVCGsC3+U9
+GJVPLzDgOlH1AHR/9dso5UBIdXL4+TThHpd+r+Z4ya5iVJKrJ6C7xnE4qDl+uN9t
+c/I0KNj9q3H4mPnf9Eq+w4bAezrPTqd7mVrXW0w4VtZAMXdJXkxv49RpMv4qUMb6
+VuazycaiO+tUq2176m+AH3yz0+C6lBYLzKdlFpP9b0XetSHwXzpA7xz2fg2NNgx5
+zjc53s/ruU4H+Mazz3xQOCQCcreOb/hbFhMF1OdQW1CMOM7ldHQCcIdy7c/b0ZbJ
+29GBPKRXL09JkpV+iUUaYzF2cJpdXATjSlK+AB/KM7bOf+lPbHBTLjHIvCKr7GWI
+bwiOYw7cksQbYzX2beLI
+=OJ4E
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/w3af/w3af-1.0.ebuild b/net-analyzer/w3af/w3af-1.0.ebuild
deleted file mode 100644
index 4bcd7bb0383a..000000000000
--- a/net-analyzer/w3af/w3af-1.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0.ebuild,v 1.5 2013/01/17 16:44:48 mgorny Exp $
-
-EAPI=2
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib python versionator
-
-MY_P=${PN}-"$(replace_version_separator 2 '-')"
-DESCRIPTION="Web Application Attack and Audit Framework"
-HOMEPAGE="http://w3af.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}-stable.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gtk"
-
-RDEPEND=">=dev-python/fpconst-0.7.2
-	dev-python/lxml
-	dev-python/nltk
-	dev-python/pyopenssl
-	dev-python/pyPdf
-	dev-python/python-cluster
-	dev-python/pyyaml
-	dev-python/simplejson
-	dev-python/soappy
-	dev-python/pysvn
-	|| (
-		net-analyzer/gnu-netcat
-		net-analyzer/netcat
-		net-analyzer/netcat6 )
-	>=net-analyzer/scapy-2
-	gtk? ( media-gfx/graphviz
-		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare(){
-	rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,simplejson,SOAPpy,yaml} || die
-	rm readme/{GPL,INSTALL} || die
-	rm plugins/attack/payloads/code/netcat || die #bug 349780
-	find "${S}" -type d -name .svn -exec rm -R {} +
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/w3af
-	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die
-	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
-	dobin "${FILESDIR}"/w3af_console || die
-	if use gtk ; then
-		dobin "${FILESDIR}"/w3af_gui || die
-	fi
-	#use flag doc is here because doc is bigger than 3 Mb
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/
-		doins -r readme/* || die
-	fi
-}
diff --git a/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild b/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild
deleted file mode 100644
index 3fafb0bcc179..000000000000
--- a/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.0_rc5-r1.ebuild,v 1.3 2013/01/17 16:44:48 mgorny Exp $
-
-EAPI=2
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2"
-
-inherit multilib python versionator
-
-MY_P=${PN}-"$(replace_version_separator 2 '-')"
-DESCRIPTION="Web Application Attack and Audit Framework"
-HOMEPAGE="http://w3af.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk"
-
-RDEPEND=">=dev-python/fpconst-0.7.2
-	dev-python/lxml
-	dev-python/nltk
-	dev-python/pyopenssl
-	dev-python/pyPdf
-	dev-python/python-cluster
-	dev-python/pyyaml
-	dev-python/simplejson
-	dev-python/soappy
-	|| (
-		net-analyzer/gnu-netcat
-		net-analyzer/netcat
-		net-analyzer/netcat6 )
-	>=net-analyzer/scapy-2
-	gtk? ( media-gfx/graphviz
-		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview )"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare(){
-	rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,simplejson,SOAPpy,yaml} || die
-	rm readme/{GPL,INSTALL} || die
-	rm plugins/attack/payloads/code/netcat || die #bug 349780
-	find "${S}" -type d -name .svn -exec rm -R {} +
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/w3af
-	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die
-	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
-	dobin "${FILESDIR}"/w3af_console || die
-	if use gtk ; then
-		dobin "${FILESDIR}"/w3af_gui || die
-	fi
-	#use flag doc is here because doc is bigger than 3 Mb
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/
-		doins -r readme/* || die
-	fi
-}
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
index 56aeac7a8938..6847ff36a7b5 100644
--- a/net-analyzer/w3af/w3af-1.1-r1.ebuild
+++ b/net-analyzer/w3af/w3af-1.1-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.1-r1.ebuild,v 1.2 2014/12/31 05:00:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.1-r1.ebuild,v 1.3 2015/03/21 14:46:10 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
 inherit multilib python-single-r1 versionator
 
 MY_P=${PN}-"$(replace_version_separator 2 '-')"
+
 DESCRIPTION="Web Application Attack and Audit Framework"
 HOMEPAGE="http://w3af.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
@@ -19,7 +20,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk"
 
-RDEPEND=">=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/nltk[${PYTHON_USEDEP}]
 	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
@@ -33,11 +35,14 @@ RDEPEND=">=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
 	|| (
 		net-analyzer/gnu-netcat
 		net-analyzer/netcat
-		net-analyzer/netcat6 )
+		net-analyzer/netcat6
+		)
 	>=net-analyzer/scapy-2
-	gtk? ( media-gfx/graphviz
+	gtk? (
+		media-gfx/graphviz
 		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview )"
+		dev-python/pygtksourceview
+		)"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -48,21 +53,19 @@ src_prepare(){
 	sed -i 's,extlib.pyPdf.,,' core/data/parsers/pdfParser.py || die
 	rm readme/{GPL,INSTALL} || die
 	rm plugins/attack/payloads/code/netcat || die #bug 349780
-	find "${S}" -type d -name .svn -exec rm -R {} +
+	esvn_clean
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/w3af
-	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die
-	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
-	dobin "${FILESDIR}"/w3af_console || die
-	if use gtk ; then
-		dobin "${FILESDIR}"/w3af_gui || die
-	fi
+	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console
+	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console}
+	dobin "${FILESDIR}"/w3af_console
+	use gtk && dobin "${FILESDIR}"/w3af_gui
 	#use flag doc is here because doc is bigger than 3 Mb
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/
-		doins -r readme/* || die
+		doins -r readme/*
 	fi
 	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
 }
diff --git a/net-analyzer/w3af/w3af-1.1.ebuild b/net-analyzer/w3af/w3af-1.1.ebuild
deleted file mode 100644
index 9e42e2bd54c9..000000000000
--- a/net-analyzer/w3af/w3af-1.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.1.ebuild,v 1.4 2013/01/17 16:44:48 mgorny Exp $
-
-EAPI=2
-
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit multilib python versionator
-
-MY_P=${PN}-"$(replace_version_separator 2 '-')"
-DESCRIPTION="Web Application Attack and Audit Framework"
-HOMEPAGE="http://w3af.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc gtk"
-
-RDEPEND=">=dev-python/fpconst-0.7.2
-	dev-python/lxml
-	dev-python/nltk
-	dev-python/pybloomfiltermmap
-	dev-python/pyopenssl
-	dev-python/pyPdf
-	dev-python/python-cluster
-	dev-python/pyyaml
-	dev-python/simplejson
-	dev-python/soappy
-	dev-python/pysvn
-	|| (
-		net-analyzer/gnu-netcat
-		net-analyzer/netcat
-		net-analyzer/netcat6 )
-	>=net-analyzer/scapy-2
-	gtk? ( media-gfx/graphviz
-		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview )"
-
-S=${WORKDIR}/${PN}
-
-src_prepare(){
-	rm -r extlib/{cluster,fpconst-0.7.2,pyPdf,SOAPpy,yaml} || die
-	sed -i 's,extlib.pyPdf.,,' core/data/parsers/pdfParser.py || die
-	rm readme/{GPL,INSTALL} || die
-	rm plugins/attack/payloads/code/netcat || die #bug 349780
-	find "${S}" -type d -name .svn -exec rm -R {} +
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/w3af
-	doins -r core extlib locales plugins profiles scripts tools w3af_gui w3af_console || die
-	fperms +x /usr/$(get_libdir)/w3af/w3af_{gui,console} || die
-	dobin "${FILESDIR}"/w3af_console || die
-	if use gtk ; then
-		dobin "${FILESDIR}"/w3af_gui || die
-	fi
-	#use flag doc is here because doc is bigger than 3 Mb
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/
-		doins -r readme/* || die
-	fi
-}
diff --git a/net-analyzer/w3af/w3af-1.5.ebuild b/net-analyzer/w3af/w3af-1.5.ebuild
index 4700f174c957..27537066c705 100644
--- a/net-analyzer/w3af/w3af-1.5.ebuild
+++ b/net-analyzer/w3af/w3af-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.5.ebuild,v 1.2 2014/12/31 05:00:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/w3af/w3af-1.5.ebuild,v 1.3 2015/03/21 14:46:10 jlec Exp $
 
 EAPI=5
 
@@ -20,14 +20,16 @@ IUSE="doc gtk"
 
 #w3af seems to ship sqlmap? maybe we should split this out...
 
-QA_PREBUILT="usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/32/lib_mysqludf_sys.so
+QA_PREBUILT="
+	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/32/lib_mysqludf_sys.so
 	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/mysql/linux/64/lib_mysqludf_sys.so
 	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.2/lib_postgresqludf_sys.so
 	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.3/lib_postgresqludf_sys.so
 	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/8.4/lib_postgresqludf_sys.so
 	usr/$(get_libdir)/${PN}/plugins/attack/db/sqlmap/udf/postgresql/linux/*/9.0/lib_postgresqludf_sys.so"
 
-RDEPEND=">=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/nltk[${PYTHON_USEDEP}]
 	dev-python/pybloomfiltermmap[${PYTHON_USEDEP}]
@@ -41,11 +43,14 @@ RDEPEND=">=dev-python/fpconst-0.7.2[${PYTHON_USEDEP}]
 	|| (
 		net-analyzer/gnu-netcat
 		net-analyzer/netcat
-		net-analyzer/netcat6 )
+		net-analyzer/netcat6
+		)
 	>=net-analyzer/scapy-2
-	gtk? ( media-gfx/graphviz
+	gtk? (
+		media-gfx/graphviz
 		>dev-python/pygtk-2.0
-		dev-python/pygtksourceview )"
+		dev-python/pygtksourceview
+		)"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -55,18 +60,18 @@ src_prepare(){
 
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
-	doins -r core locales plugins profiles scripts tools w3af_gui w3af_console || die
-	fperms +x /usr/$(get_libdir)/${PN}/${PN}_{gui,console} || die
-	dobin "${FILESDIR}"/${PN}_console || die
+	doins -r core locales plugins profiles scripts tools w3af_gui w3af_console
+	fperms +x /usr/$(get_libdir)/${PN}/${PN}_{gui,console}
+	dobin "${FILESDIR}"/${PN}_console
 	if use gtk ; then
-		dobin "${FILESDIR}"/${PN}_gui || die
+		dobin "${FILESDIR}"/${PN}_gui
 	else
 		rm "${ED}"/usr/$(get_libdir)/${PN}/w3af_gui
 	fi
 	#use flag doc is here because doc is bigger than 3 Mb
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/
-		doins -r doc/* || die
+		doins -r doc/*
 	fi
 	python_fix_shebang "${ED}"usr/$(get_libdir)/${PN}
 }