Old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 10 insertions, 519 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index b31c29519f4d..25bb43920bbf 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.331 2014/12/03 09:57:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.332 2014/12/03 10:08:28 jer Exp $
+
+  03 Dec 2014; Jeroen Roovers <jer@gentoo.org> -nmap-6.01.ebuild,
+  -nmap-6.25.ebuild, -nmap-6.25-r1.ebuild,
+  -files/nmap-5.51-su-to-zenmap-fix.patch, -files/nmap-6.25-lua.patch:
+  Old.
 
   03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> nmap-6.47-r1.ebuild:
   Stable for ppc, wrt bug #480474
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 6584027ab85f..66ccdd37c8e4 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -4,37 +4,20 @@ Hash: SHA256
 AUX nmap-4.75-nolua.patch 364 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619 SHA512 df83711db7250d8debbb70867da3e066ba13edf9b304cc5c61824a5a0f968bff3057c0a29efffbfdd9a68871f0cca0e93f2f6051c907b8ae4242a07eada832fc WHIRLPOOL 40a56b9ebf2c99578d4fab7b20ba0379e8ef55c3c782f8c29f33e9dc302b669434dd21fa40e1e82ce0b1249080abcaa3ce95c2dc23db010f7bd87f3f1cf99f10
 AUX nmap-5.10_beta1-string.patch 252 SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506 SHA512 d1c6a446400fa86700c5ce690c3498894a9796b17bb70a29b933797eb2abb38285ebc21a236d8f1f4fa837c45a1abc49555aee13266a31089b219f9b4ef07be2 WHIRLPOOL 3e7ba87ef26d7462b82e3986c37f7a2f1074dc2db7ba6a357ade3869089657a5200afacac6490a60ff43700b6e7812c1c95ac18efac381037590d851513dbf9e
 AUX nmap-5.21-python.patch 1219 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74 SHA512 d670b382d183a55d0a744d4055aafffdaf64b071ae169e94e7d627ca8b74df38d02ef7858b0976b7079828c14705d0f1998a9640445f3cd4f5f4d4c5b2ce0bf3 WHIRLPOOL 1d84ccf26fb0affff5a05f6fd00ea5aff1bbb3a9d3320e7a90a9feeba68aa7fa38e8be527eea93824616003a61321f21fa8fb5ce662e4b43ef8581679f40bd3a
-AUX nmap-5.51-su-to-zenmap-fix.patch 785 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da SHA512 44482306e7346fa7896a4c900d06431ebadf0e32ca5b9abd3e3f32e06f20e11809c0bdaa62fa3807431b4dfab7c6ddf422dc05a5a96e9e3f9217f2c64285bce4 WHIRLPOOL 516bf0d76e8633605c106ff6982f089df1e4c9d696e11bb589000fed8355b5a504694c286a03bd9845508aa833c11d3fa1ae61c961e72b87a0329d6aabd37126
 AUX nmap-6.01-make.patch 571 SHA256 d315795797c60712b00dbdc0e1fe5df6851575e0dbc11abb772a51c739ab60cb SHA512 47752ac65a07aef68eb075b72a0e9062612a2df08135d3f4284805f8fdc394a1fa3b937c1df018f7cce58f4c96db57af17e720250b6f67ce80f8cbb35eb82deb WHIRLPOOL b9ec86290bb1a681ee16aeaeb336ca7def8689d0ae311bc223591eefbade0db6b5f58ebf86d52406b24d8c656f51e06d049a4c3893a730aafe5448a7f5765e42
 AUX nmap-6.25-liblua-ar.patch 328 SHA256 3bce55abe4cf17d7c7bb56731151c4d4f1c5aef04e8294bf79a9712fa015fce2 SHA512 6bb15078e79ef281b026e25199fc76bcd1b7242da0d6513ac9b078f130e521e6db506c1c36d33ef72a2198c3054111d95d6ac0654f7d6bb7549d6308ce864291 WHIRLPOOL d6f29209ee4a92e2f5b564d5aeaa8814355df2a9142665ba1ce980693c830214a1d89dc66c3f0573237273d0fc502c7ff8b39be53f6afcca29dd94fe6f081b7b
-AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0ecd7f99711bb68424214c SHA512 837e8f95ea1dfa1176abd576894e71123e867181378812f783faf408b27746e20d69b60f049ef7d37e07a2764d696ea1b169c29867e62d34378d11ce9b9e25e1 WHIRLPOOL fc821d90705c03fdbc56a3618ee96e69ef9662f81dc013eeaa1ebd8d03a1f1936a957de5d62c3402cfebc0ed34fb5c84229e7c6048d6438ecab0481d7d465d17
 AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
 AUX nmap-6.47-no-FORTIFY_SOURCE.patch 2388 SHA256 a639ee69b7aa01f36ffe5ad251bf3fc21b990b825459fb4932d83ebf7728c3d8 SHA512 a18ffd2c46393e069a8d892cde3fce542aebb4663c4d902a7443f206c0393dd7c3f33a5753ba3eeacb989cd95a4adb9ba4217e8efec313a7bb9f43a34678aff8 WHIRLPOOL a9479b56f37753758030146e99b09bb05e18ea1c2c9adeb72ca6052e44a2e03815135f74d258b12d3a9115864434127d68cd727ee7e50ddce77cd87f4dc5a71a
 AUX nmap-6.47-no-libnl.patch 1903 SHA256 5f9fa774374ee1c410123b0349d501d0aa265feffd3aeebd6f51aa6276d334fc SHA512 5e101915a4259502c88a2e8588e9d7b77464ce5129f78c5458265e0ce0dd13adc514f4df853ade6c8502c906c96a47954e1a432e1177a5d8acbbb444574e4083 WHIRLPOOL c74013ec6878c57fd726f6a8668d92abdc502521e27140ab37fa22fd3debd17138149c246798ac600fb01ebd4d4a3fd3834f2c806f15e4318c933c81a85bc8ba
-DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd
-DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
 DIST nmap-6.47.tar.bz2 7878122 SHA256 8fa11e9e203ce2d81a207db5ca4f110a525f6c01c1dd0018325a7112a51aa591 SHA512 f98b92a26f4e912fe15c36a21dfff7bfb9f11c2410f4035330100648fbad7f808ef9e069c63704bbb50199272ae65ea81555de6c97eb8ee152114f44ed5a9296 WHIRLPOOL 4f92f0aeaaa03a94dc27080b5f0c2396325f282b7a781d163d1e05a71117896c4581154b58383f136eed1fcf2cce8f1b94e3344f3fc5d4955cf1f4cfc1417573
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
-EBUILD nmap-6.01.ebuild 2644 SHA256 a2e907c693677dcc8a477898731770103682529c93594fd2df7723420ab6a58b SHA512 541cdb4c5c62b5dd20f35f216d703e31f2f9a8d354f4532fb95f429aad527fa9ca3ba86d2d8a72968c3ea4229254325cd85cc55d70a067bcff6752b1dc54ad31 WHIRLPOOL d6a183fca1074ff2c905e17145317524d82dd6028ae843602ec7bd81abbff1e973533e36a278d50ab063a21804da1c019dd59af032054f884a013d5f058f4394
-EBUILD nmap-6.25-r1.ebuild 3609 SHA256 d9478ec7ed6758121432cf11b3fe1ba5643fa71ffb8aa883c98c80cb7f73368a SHA512 9a426d8c1d875819cb332254a27fc3a2be317aedeb4c7f9f3680001a7a36f119119f6dcdf96f5b9f133bd31d06b3cfb6ff9b8dddc58aea607241d4630847099c WHIRLPOOL 5167df00f1f79b4c01c896a11269c3b361e42338159839bc6b24dd69f361c50c98d059118d36f051b579601b3fb9f3366042aa4e00f09615e0e20020ea79a0ef
-EBUILD nmap-6.25.ebuild 3479 SHA256 3fc8097d4dcac997838289fd0df88ccb21f084b7b276dfe28f7392ec60cb583c SHA512 d4ee4d0b830ce2667e87c9ffda50a23bc59f6fe7ffe623453555f76b29ac21ae001bdb00dd04ec25e485002c37f953a5f14af11c932675d89f2b49a3f0aa7897 WHIRLPOOL f4faf39d4a2922c776be592971c4f421aada9c93e54f64923397ce29363f14ba458f57dc2662720caed7d63ad796b64a74d5b46545ad4af6191d1c5580a9b151
 EBUILD nmap-6.47-r1.ebuild 3807 SHA256 159927583d8299c0f1411672055b1fa69ef486b9dbf82ad66f2abb17cdc6479c SHA512 e99dff9a0dd34ac18ceec5160664ad1a4f9edbe47ab859ea84fea9ac2f617e2fa8b133f0d472e5a966b1bcdd158b0e8562745ab81ec25486ecfcbacb695a668c WHIRLPOOL c879d44f5ac7e2744ebe629b0b761bce964adc5e91d25bbce88c93f8f152e7e3e22548dafbc74a61c7b5b48327b52b0773736a8397c185393f2068562f756e25
-MISC ChangeLog 41186 SHA256 6f7f30ab874677c7567ad2da5333979bdbcf6ddb502bedcb7aa9413ba1723a33 SHA512 939b782373042e41b4ce816d58d9eb8ec6ae047c372662ddbdaa1ff68166cdd48401caaa17ee9b43b2d8a3d271c3977df4c2b163562f20c9297e7089b6e82b92 WHIRLPOOL 015018eeafcd9b5ad56574b9bd1c8f3b4ea35d9cfb5f921e58f7c153911e345987b0d1bba613a90e9f2d169ed55f3ca2e90a7237f532d5fe6301fbb097aa7533
+MISC ChangeLog 41374 SHA256 aae2e4a32e4d70fe40cc0acf10a742c59f3ab42660e9a1d03461fd6d80ddf5a8 SHA512 033d0af944785089b283737dc694a7417b0bae5c16beb9d9284cc4d18479e999a025d5d4319cefff5dcb5674acd3b31e4bd4c9666f07105c39216f8474e6c564 WHIRLPOOL 522ebb36c1bc7c6c4c3e4ad65837f326157c40fe79b6020ddf4be423a231ccc2b3ba0c4c6c9e5b1497c772fd202dea78e22818a2726662cc8bf55ddd43bc4ecd
 MISC metadata.xml 698 SHA256 0bc8d424bc183f9dc54ed8bc8b957a3ececa0970e8f8826400bb594cdcd178d1 SHA512 929fa760d9178548397d23e90f08ed458f90e25ecc7a7e0193d696b904fff761c67f6957beeb9bfeff6832a0a8d2832ed4a8cf2e3742e3a18b869695f4b4cd09 WHIRLPOOL 7cf95e8e5aa1edadc28bcf6ad32ab22c03d48a748470738414b5b8f3f57948a4ce5a1acc4e17186a28df2c7c037f6db14f3b8a5bb7556dc10bd0035460e723fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUft6YAAoJELp701BxlEWf76wP/1IfVliYkja5yCRZMFIdS44E
-5Cs/IyvcU4EiB2F25Xr8MeptCo+cJkB+VaxXQ05f4e4opRpPO1WtgITB7XP9w24I
-xpdvNLQXMAzaU3ZEcIPli9amH9K8/WoIiHslzCX3T/FOHTpbIiVWQiOYce+Iamsu
-VnCCE/Z27vk7TxS5aLEGRDzwCgjA2MbJmt40Azk8VGzgQYCHmjq8VJK1Dz8GRVQC
-stALaPyipHt7ACPTmirJNr+iKrTPnEhYuAJr3LF9wjqRrJC126KNrOH5NvkbkhOZ
-DKieAZV/Y0BlJaJdOJ+6bG4MWD+x2cfkX2IzJiuXXYhk9zKSN3v951kj4xyPcY6c
-pwRJmM/G3tOMqQEywC6jSVqR1vZDZ3iruaJUhrnlF0FZ3ADsDHJnbWOg3Amz5a9A
-D9SntVIeKLZf+4CjuhsCO8SK1o6axbWReZzp4x0Jin6xlpEyDczkWEE4C3UqbIGp
-b1sbknMQBPkyImfhXI1YXvSRQujKkOAD5xLuiCGZxpB7v3mu2rjg7vWCbSbFTJP+
-6lBfuCY0g2nBGbYL4+GcCnzZoF03Y+7QoROTXPMwBXv7I+O1fugam4lJRvrTObK7
-LFh9POAwkup18Ltl6RsmsK+XvNOg1jTXDNp09hbPMWSrMFsL/eapid76Ro4ZFrM/
-6dcoQttmYRu/qIXi03eV
-=rx1y
+iEYEAREIAAYFAlR+4R0ACgkQVWmRsqeSphMGuQCeMXhZlmSDUQtxUUFpbp7qV1OK
+yI4Anib3rA3X7liAbr4dh9ttqguMYu2D
+=Z3Dg
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch b/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
deleted file mode 100644
index a2b53907752a..000000000000
--- a/net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh
---- nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:08:06.141000195 +0200
-+++ nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:09:00.487000200 +0200
-@@ -40,8 +40,8 @@ else
-     fi
-     case $SU_TO_ROOT_X in
-       gksu) gksu -u "$PRIV" "$COMMAND";;
--      kdesu) kdesu -u "$PRIV" "$COMMAND";;
--      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
-+      kdesu) kdesu -u "$PRIV" $COMMAND;;
-+      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" $COMMAND;;
-       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
-   # As a last resort, open a new xterm use sudo/su
-       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;
diff --git a/net-analyzer/nmap/files/nmap-6.25-lua.patch b/net-analyzer/nmap/files/nmap-6.25-lua.patch
deleted file mode 100644
index 4f7786c37b68..000000000000
--- a/net-analyzer/nmap/files/nmap-6.25-lua.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- a/output.h
-+++ b/output.h
-@@ -226,6 +226,10 @@
- void printscriptresults(ScriptResults *scriptResults, stype scantype);
- 
- void printhostscriptresults(Target *currenths);
-+
-+/*This is a helper function to determine the ordering of the script results
-+  based on their id */
-+bool comparescriptids(ScriptResult first, ScriptResult second);
- #endif
- 
- /* Print a table with traceroute hops. */
-@@ -253,8 +257,4 @@
-    were found. */
- void printdatafilepaths();
- 
--/*This is a helper function to determine the ordering of the script results
--  based on their id */
--bool comparescriptids(ScriptResult first, ScriptResult second);
--
- #endif /* OUTPUT_H */
---- a/output.cc
-+++ b/output.cc
-@@ -2613,6 +2613,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- /*This is a helper function to determine the ordering of the script results
-   based on their id */
- bool comparescriptids(ScriptResult first, ScriptResult second){
-@@ -2625,5 +2626,6 @@
-     else
-         return false;
- }
-+#endif
- 
- 
---- a/portlist.cc
-+++ b/portlist.cc
-@@ -144,6 +144,7 @@
-   }
- }
- 
-+#ifndef NOLUA
- void Port::freeScriptResults(void)
- {
-     while (!scriptResults.empty()) {
-@@ -151,6 +152,7 @@
-         scriptResults.pop_front();
-     }
- }
-+#endif
- 
- /* Fills in namebuf (as long as there is space in buflen) with the
-    Name nmap normal output will use to describe the port.  This takes
---- a/Target.cc
-+++ b/Target.cc
-@@ -162,10 +162,12 @@
- 
- Target::~Target() {
-   FreeInternal();
-+#ifndef NOLUA
-   while (!scriptResults.empty()) {
-     scriptResults.front().clear();
-     scriptResults.pop_front();
-   }
-+#endif
- }
- 
- void Target::FreeInternal() {
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
deleted file mode 100644
index f95dccb79d66..000000000000
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.26 2014/08/28 10:07:45 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic python toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk lua ncat ndiff nmap-update nping ssl"
-
-NMAP_PYTHON_DEPEND="
-|| (
-	dev-lang/python:2.7[sqlite]
-)
-"
-DEPEND="
-	dev-libs/apr
-	dev-libs/libpcre
-	net-libs/libpcap
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6
-		${NMAP_PYTHON_DEPEND}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python_set_active_version 2
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
-	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
-	epatch "${FILESDIR}"/${PN}-5.21-python.patch
-	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
-	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
-
-	# bug #416987
-	epatch "${FILESDIR}"/${P}-make.patch
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.25-r1.ebuild b/net-analyzer/nmap/nmap-6.25-r1.ebuild
deleted file mode 100644
index 42426464683e..000000000000
--- a/net-analyzer/nmap/nmap-6.25-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25-r1.ebuild,v 1.3 2014/11/12 16:28:24 floppym Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
-NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
-for lingua in ${NMAP_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-REQUIRED_USE="
-	gtk? ( ${PYTHON_REQUIRED_USE} )
-	ndiff? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${PYTHON_DEPS} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-lua.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || die
-
-	mv docs/man-xlate/${PN}-j{p,a}.1 || die
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
-			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	if use gtk; then
-		doicon "${DISTDIR}/nmap-logo-64.png"
-		python_optimize
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
deleted file mode 100644
index 0e2fd54bc3c5..000000000000
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.30 2014/08/28 10:07:45 jer Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic python toolchain-funcs
-
-MY_P=${P/_beta/BETA}
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://nmap.org/"
-SRC_URI="
-	http://nmap.org/dist/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jer/nmap-logo-64.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
-NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
-for lingua in ${NMAP_LINGUAS}; do
-	IUSE+=" linguas_${lingua}"
-done
-
-NMAP_PYTHON_DEPEND="
-|| (
-	dev-lang/python:2.7[sqlite]
-)
-"
-RDEPEND="
-	dev-libs/apr
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	gtk? (
-		>=x11-libs/gtk+-2.6:2
-		>=dev-python/pygtk-2.6
-		${NMAP_PYTHON_DEPEND}
-	)
-	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if use gtk || use ndiff; then
-		python_set_active_version 2
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-4.75-nolua.patch \
-		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
-		"${FILESDIR}"/${PN}-5.21-python.patch \
-		"${FILESDIR}"/${PN}-6.01-make.patch \
-		"${FILESDIR}"/${PN}-6.25-lua.patch \
-		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || die
-
-	mv docs/man-xlate/${PN}-j{p,a}.1 || die
-	if use nls; then
-		local lingua=''
-		for lingua in ${NMAP_LINGUAS}; do
-			if ! use linguas_${lingua}; then
-				rm -rf zenmap/share/zenmap/locale/${lingua}
-				rm -f zenmap/share/zenmap/locale/${lingua}.po
-			fi
-		done
-	else
-		# configure/make ignores --disable-nls
-		for lingua in ${NMAP_LINGUAS}; do
-			rm -rf zenmap/share/zenmap/locale/${lingua}
-			rm -f zenmap/share/zenmap/locale/${lingua}.po
-		done
-	fi
-
-	sed -i \
-		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
-		Makefile.in || die
-
-	# Fix desktop files wrt bug #432714
-	sed -i \
-		-e '/^Encoding/d' \
-		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
-		zenmap/install_scripts/unix/zenmap-root.desktop \
-		zenmap/install_scripts/unix/zenmap.desktop || die
-
-	epatch_user
-}
-
-src_configure() {
-	# The bundled libdnet is incompatible with the version available in the
-	# tree, so we cannot use the system library here.
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included
-}
-
-src_compile() {
-	emake \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB )
-}
-
-src_install() {
-	LC_ALL=C emake -j1 \
-		DESTDIR="${D}" \
-		STRIP=: \
-		nmapdatadir="${EPREFIX}"/usr/share/nmap \
-		install
-	if use nmap-update;then
-		LC_ALL=C emake -j1 \
-			-C nmap-update \
-			DESTDIR="${D}" \
-			STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap \
-			install
-	fi
-
-	dodoc CHANGELOG HACKING docs/README docs/*.txt
-
-	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
-}