diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 5e351108f..55195a02a 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,23 +1,3 @@
-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-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.25-su-to-zenmap.patch 667 SHA256 f59f82368f633e7de1cc3a546d513d18ad5210595e93c8b5da1b482bece5ecc6 SHA512 bd6446f9834f6d918aa39efdfe779f36465f0a39f6079587dba39bc429f1a42810e46dab776cf9207d6bd5ba15456db08a965c3f0e036d2c7ece3485a6c7431a WHIRLPOOL c070b47e3ab6d08aa0f5c115a5cbe56b6d1349694b549c56fafcf62436da0651ff22f64d725d0aa931ecb723df338d885158615fd34a05d5f7d5e98908a12af0
-AUX nmap-6.40-fix-lib-order.patch 1547 SHA256 c57ddd4e4f95d3133b1cce4d30af05711e70babc2d1f97047d0963a17f378810 SHA512 251c9ef5d9aac784312b2e0c6c46057b12a8190d82a26eaac9dc3c3c46cf1c43d71220a38ab731c3b2606679cd2dee6022b5f61e8b4b8238e9704273f0e4aca5 WHIRLPOOL 3acf6131ab6699fef30ed51b018021b1cc70c2636f9058fa1bec8e798f956ac6b4b3aecaf047f32d6aca900c8af99f118a72de455ac8200b2e42be2b268c1a4c
-AUX nmap-6.40-uninstaller.patch 629 SHA256 5a440d5b04441a18dfe2f577e73d8f063a4e6289874c361cee53c3c9d33d6bcf SHA512 291c98a9d51ef1cd43617645417f3a7a602f70be1d511f5f6ed1ecc7104a66524eb87290867a896c92012e9bc4eb51ae43ae2d83542d7df5c688499ee62d132d WHIRLPOOL 5ffd985cdc3dcb91ee456ed1fbd4e8804fac4efa01728b2759f9d5df3c43992feeaafa791301acd4be4b89d9b1b6cc1bbeff49306d73f3a8948de9ea6275a4b2
-AUX nmap-6.46-uninstaller.patch 619 SHA256 e5f649e95a7a87a9c2a5ab89657a56468036726146441cee34bad6184aeb8349 SHA512 da89808d23ed14b0f748a57d3238667adf65eb5278bcbe5a599d06fd4bc5ad2c3492d824639f97d50be9a973fd53bb395fccd855a712bd11d3e963dc4bb11833 WHIRLPOOL 223f448f3edd34945b5a4f79c9740159df40d65bdda1cadada241a0b00ae8893ea84874ad4c000629d305c221ad687b521fd9fb2d1d6786b8489d94746d9eb08
 AUX nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
-DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
-DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98
-DIST nmap-6.46.tar.bz2 7911353 SHA256 3f89d9053c69507fe9533c40188a6561d49607a37b1db6380aed9039d4883137 SHA512 eec55267009d1e539df06187ed1522b86e3fa36282159fc872ed5537d93d361201d2d944bcde6af86f22816c0038db7832b011d4ece204ea7c470b716a2dc4c7 WHIRLPOOL 172eb6da55cea1cb559ddd979458e4a7b8f179675b4d1261153f85eb010ba9e64aec61f6c5566a874319e06aa5e4df21881384dc699cac98be09e59b0dafe086
-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.25-r1.ebuild 3446 SHA256 504a58b1e84ada98f687b0abd0545fa89dbdf833a64eec0999027bd39af93c72 SHA512 7a1eadb8beb64cb0e34eac195560743b16218e507ab38070f4e2cbd51f267c40af6392cfb18658efbbe610ef2b2114918deac4d6439e89286e8f52948ccdf456 WHIRLPOOL aefb2b3cdef41077c9bdecc3e292aa56961f3294dc791ed3bce9b475c2061ed93be98eea4fdd1f649c85d148a095300d8369036339f17a92e5935db2ce201af9
-EBUILD nmap-6.40-r2.ebuild 3476 SHA256 61a0d6a1f7757db6292aeafbb09db76a93a79f6132fdb6675b2d32fb3da41f21 SHA512 3501f1ca96b1574638800edd0a518f31ab18dd5b1a19dc02633123759ca380e5821f8471182905b79c09c69d502006d5a916882b09af273ad1f94c2ffa421e75 WHIRLPOOL 7ce69954295a66422c5f9b9cfc35cd43ceac0dd3ea0ae85c909d54e0abb6471d36ca92eec47b82a4a2658988a1c4e803710c592c33aee9fd3fb661220d672af3
-EBUILD nmap-6.40-r3.ebuild 3519 SHA256 749bd46c259d9be0bf9709813c51bd58b2112b15c3b3405a159b42f99b4a71ce SHA512 7c61d7fa27d79f0fd993cc2092a792324b49f549fe916ce9d1a1b4ef2bf391dcfb04307e20c90ca256a9eeb9f7a85f655b432649a26930a453dbfdee8447953c WHIRLPOOL 8139b0b958c797078787a019ccb048335f38e8da559c6547f7bede6fab0be47a8d539f9f1aaa0e60dcf98e1a2bb69438466e59a7b5a756759832894f235d2370
-EBUILD nmap-6.46.ebuild 3598 SHA256 374f34dd657d0fddc4f07aa3894598779052aff1a9ad78bb561ffdd259308b6a SHA512 1e52212718b6da2c705fb9a1d2314a79911d64343381fdf5b1276109694878ecdc282979afa163777a8dcdaf28dc8fe3f21767a1fd5934d076bcd98817902f5f WHIRLPOOL 0dad13c20839e3400d35c465a41ea54f8c88fd09d62b3e82e0880663028c4b62eba4c8882207cdf6349232c5cc097a2995939f1e6404d7d5c24b061b57f977cc
-EBUILD nmap-6.47.ebuild 3598 SHA256 374f34dd657d0fddc4f07aa3894598779052aff1a9ad78bb561ffdd259308b6a SHA512 1e52212718b6da2c705fb9a1d2314a79911d64343381fdf5b1276109694878ecdc282979afa163777a8dcdaf28dc8fe3f21767a1fd5934d076bcd98817902f5f WHIRLPOOL 0dad13c20839e3400d35c465a41ea54f8c88fd09d62b3e82e0880663028c4b62eba4c8882207cdf6349232c5cc097a2995939f1e6404d7d5c24b061b57f977cc
 EBUILD nmap-9999.ebuild 3221 SHA256 fabf76f70f7f4a59b41a1a8fc41a93ae389fdd23261beb987a0a4b1460947cbf SHA512 0891b05b17dcdce8c00634985d901642d4430be153f756c56a05cea92b065882084701d218336dce216e2b98db23f544b5ffc74f676dd671d38f52b679eb429e WHIRLPOOL 0269134ffab9d0c0d1b9fc29197a4e842cb013052c400059c5e81afe8f3eb25579304cce9c5e4906b47edf0c33b1f007f87f8218c708187b380f3721b36b83e4
diff --git a/net-analyzer/nmap/files/nmap-4.75-nolua.patch b/net-analyzer/nmap/files/nmap-4.75-nolua.patch
deleted file mode 100644
index 30bb1e0c8..000000000
--- a/net-analyzer/nmap/files/nmap-4.75-nolua.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
---- nmap-4.75-orig/Makefile.in	2008-09-05 07:32:06.000000000 +0200
-+++ nmap-4.75/Makefile.in	2008-09-09 16:34:38.000000000 +0200
-@@ -258,5 +258,5 @@
- 	./config.status --recheck
- 
- makefile.dep:
--	$(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
-+	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
- include makefile.dep
diff --git a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
deleted file mode 100644
index df29db378..000000000
--- a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nmap-5.10BETA1/Target.h.org	2009-12-08 08:21:59.000000000 +0100
-+++ nmap-5.10BETA1/Target.h	2009-12-08 08:22:02.000000000 +0100
-@@ -99,6 +99,8 @@
- 
- #ifndef NOLUA
- #include "nse_main.h"
-+#else
-+#include <string>
- #endif
- 
- #include "portreasons.h"
diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch b/net-analyzer/nmap/files/nmap-5.21-python.patch
deleted file mode 100644
index aa0d4f9db..000000000
--- a/net-analyzer/nmap/files/nmap-5.21-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
---- nmap-5.21-orig/Makefile.in	2010-01-31 09:53:53.000000000 +0100
-+++ nmap-5.21/Makefile.in	2010-01-31 09:54:48.000000000 +0100
-@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
- 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
--	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-+	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
- 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
- # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
- # already a link.
-@@ -267,7 +267,7 @@ build-ndiff:
- 	cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
- 
- install-ndiff:
--	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
-+	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
- 
- NSE_FILES = scripts/script.db scripts/*.nse
- NSE_LIB_LUA_FILES = nselib/*.lua
diff --git a/net-analyzer/nmap/files/nmap-6.01-make.patch b/net-analyzer/nmap/files/nmap-6.01-make.patch
deleted file mode 100644
index 2711b3168..000000000
--- a/net-analyzer/nmap/files/nmap-6.01-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -119,6 +119,8 @@
- 	rm -f $@
- 	$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
-+$(NBASEDIR)/libnbase.a: nbase_build
-+
- build-%: %/Makefile
- 	cd $* && $(MAKE)
- 
-@@ -152,7 +154,7 @@
- liblinear_build: $(LIBLINEARDIR)/Makefile
- 	@echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)"
- 
--build-nmap-update: nmap-update/default_channel.h
-+build-nmap-update: nbase_build nmap-update/default_channel.h
- 
- #$(LIBPCAPDIR)/Makefile:
- #	@echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
diff --git a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch b/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch
deleted file mode 100644
index 5aa9fa7f6..000000000
--- a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/liblua/Makefile
-+++ b/liblua/Makefile
-@@ -11,7 +11,7 @@
- LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
- LIBS= -lm $(SYSLIBS) $(MYLIBS)
- 
--AR= ar rcu
-+AR= ar
- RANLIB= ranlib
- RM= rm -f
- 
-@@ -56,7 +56,7 @@
- a:	$(ALL_A)
- 
- $(LUA_A): $(BASE_O)
--	$(AR) $@ $(BASE_O)
-+	$(AR) rcu $@ $(BASE_O)
- 	$(RANLIB) $@
- 
- $(LUA_T): $(LUA_O) $(LUA_A)
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 4f7786c37..000000000
--- 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/files/nmap-6.25-su-to-zenmap.patch b/net-analyzer/nmap/files/nmap-6.25-su-to-zenmap.patch
deleted file mode 100644
index dd929bf4a..000000000
--- a/net-analyzer/nmap/files/nmap-6.25-su-to-zenmap.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- nmap-6.25-orig/zenmap/install_scripts/unix/su-to-zenmap.sh	2012-08-20 04:11:06.000000000 +0800
-+++ nmap-6.25/zenmap/install_scripts/unix/su-to-zenmap.sh	2012-12-01 17:35:16.243995226 +0800
-@@ -40,8 +40,8 @@
-     fi
-     case $SU_TO_ROOT_X in
-       gksu) gksu -u "$PRIV" "$COMMAND";;
--      kdesu) kdesu -u "$PRIV" -c "$COMMAND";;
--      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c "$COMMAND";;
-+      kdesu) kdesu -u "$PRIV" -c $COMMAND;;
-+      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" -c $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.40-fix-lib-order.patch b/net-analyzer/nmap/files/nmap-6.40-fix-lib-order.patch
deleted file mode 100644
index 3dae314e1..000000000
--- a/net-analyzer/nmap/files/nmap-6.40-fix-lib-order.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -U3 -r nmap-6.40/ncat/Makefile.in nmap-6.40.patched/ncat/Makefile.in
---- nmap-6.40/ncat/Makefile.in	2013-07-08 18:58:42.000000000 +0200
-+++ nmap-6.40.patched/ncat/Makefile.in	2013-08-03 16:44:29.307312818 +0200
-@@ -136,16 +136,16 @@
- 	fi
- 
- test/addrset: test/addrset.o ncat_core.o sys_wrap.o util.o $(LUA_OBJS)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS)
-+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS) $(LIBS)
- 
- test/test-uri: test/test-uri.o base64.o http.o ncat_core.o  sys_wrap.o util.o $(LUA_OBJS)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS)
-+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS) $(LIBS)
- 
- test/test-cmdline-split: test/test-cmdline-split.o ncat_posix.o ncat_core.o sys_wrap.o util.o $(LUA_OBJS)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS)
-+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS) $(LIBS)
- 
- test/test-wildcard: test/test-wildcard.o ncat_core.o ncat_ssl.o sys_wrap.o util.o $(LUA_OBJS)
--	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(LIBS) $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS)
-+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $^ $(NSOCKLIB) $(NBASELIB) $(OPENSSL_LIBS) $(PCAP_LIBS) $(LUA_LIBS) $(LIBS)
- 
- .PHONY: uninstall all clean distclean
- 
diff --git a/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch
deleted file mode 100644
index 10bc67b14..000000000
--- a/net-analyzer/nmap/files/nmap-6.40-uninstaller.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/zenmap/setup.py
-+++ b/zenmap/setup.py
-@@ -238,7 +238,6 @@
-         self.set_perms()
-         self.set_modules_path()
-         self.fix_paths()
--        self.create_uninstaller()
-         self.write_installed_files()
- 
-     def get_installed_files(self):
-@@ -255,7 +254,6 @@
-         for dirpath, dirs, files in os.walk(os.path.join(self.install_data, data_dir)):
-             for dir in dirs:
-                 installed_files.append(os.path.join(dirpath, dir))
--        installed_files.append(os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
-         return installed_files
- 
-     def create_uninstaller(self):
diff --git a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
deleted file mode 100644
index 6b43f8f5a..000000000
--- a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/zenmap/setup.py
-+++ b/zenmap/setup.py
-@@ -245,7 +245,6 @@
-         self.set_perms()
-         self.set_modules_path()
-         self.fix_paths()
--        self.create_uninstaller()
-         self.write_installed_files()
- 
-     def get_installed_files(self):
-@@ -263,8 +262,6 @@
-                 os.path.join(self.install_data, data_dir)):
-             for dir in dirs:
-                 installed_files.append(os.path.join(dirpath, dir))
--        installed_files.append(
--                os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
-         return installed_files
- 
-     def create_uninstaller(self):
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 ad2ddb755..000000000
--- a/net-analyzer/nmap/nmap-6.25-r1.ebuild
+++ /dev/null
@@ -1,143 +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/nmap/nmap-6.25.ebuild,v 1.13 2013/01/26 18:18:04 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"
-
-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 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]
-	dev-lang/python:2.6[sqlite]
-	dev-lang/python:2.5[sqlite]
-	dev-python/pysqlite:2
-)
-"
-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_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_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_enable nls) \
-		$(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 "${FILESDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.40-r2.ebuild b/net-analyzer/nmap/nmap-6.40-r2.ebuild
deleted file mode 100644
index dbe014e04..000000000
--- a/net-analyzer/nmap/nmap-6.40-r2.ebuild
+++ /dev/null
@@ -1,142 +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/nmap/nmap-6.40-r1.ebuild,v 1.2 2013/09/05 18:58:48 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="sqlite"
-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="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-NMAP_PYTHON_DEPEND="
-	|| ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2
-		${NMAP_PYTHON_DEPEND}
-	)
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-#use build-in lua. See bug #407091
-#	lua? ( >=dev-lang/lua-5.2[deprecated] )
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	# prevent unpacking the logo
-	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-liblua-ar.patch \
-		"${FILESDIR}"/${P}-uninstaller.patch
-
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || 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 zenmap) \
-		$(usex lua --with-liblua=included --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-}
-
-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 zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.40-r3.ebuild b/net-analyzer/nmap/nmap-6.40-r3.ebuild
deleted file mode 100644
index ef6b6ab78..000000000
--- a/net-analyzer/nmap/nmap-6.40-r3.ebuild
+++ /dev/null
@@ -1,143 +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/nmap/nmap-6.40-r1.ebuild,v 1.2 2013/09/05 18:58:48 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="sqlite"
-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="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-NMAP_PYTHON_DEPEND="
-	|| ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2
-		${NMAP_PYTHON_DEPEND}
-	)
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-#use build-in lua. See bug #407091
-#	lua? ( >=dev-lang/lua-5.2[deprecated] )
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	# prevent unpacking the logo
-	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-liblua-ar.patch \
-		"${FILESDIR}"/${P}-uninstaller.patch \
-		"${FILESDIR}"/${P}-fix-lib-order.patch
-
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || 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 zenmap) \
-		$(usex lua --with-liblua=included --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-}
-
-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 zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.46.ebuild b/net-analyzer/nmap/nmap-6.46.ebuild
deleted file mode 100644
index 0e1f17b79..000000000
--- a/net-analyzer/nmap/nmap-6.46.ebuild
+++ /dev/null
@@ -1,145 +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.46.ebuild,v 1.2 2014/06/06 00:19:47 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="sqlite"
-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="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-NMAP_PYTHON_DEPEND="
-	|| ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	dev-libs/liblinear
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2
-		${NMAP_PYTHON_DEPEND}
-	)
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-#use build-in lua. See bug #407091
-#	lua? ( >=dev-lang/lua-5.2[deprecated] )
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	# prevent unpacking the logo
-	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-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || 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 zenmap) \
-		$(usex lua --with-liblua=included --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-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 zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
-}
diff --git a/net-analyzer/nmap/nmap-6.47.ebuild b/net-analyzer/nmap/nmap-6.47.ebuild
deleted file mode 100644
index 0e1f17b79..000000000
--- a/net-analyzer/nmap/nmap-6.47.ebuild
+++ /dev/null
@@ -1,145 +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.46.ebuild,v 1.2 2014/06/06 00:19:47 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-PYTHON_REQ_USE="sqlite"
-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="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
-NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
-IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
-
-NMAP_PYTHON_DEPEND="
-	|| ( ${PYTHON_DEPS} )
-"
-RDEPEND="
-	dev-libs/liblinear
-	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
-	zenmap? (
-		dev-python/pygtk:2
-		${NMAP_PYTHON_DEPEND}
-	)
-	ndiff? ( ${NMAP_PYTHON_DEPEND} )
-	nls? ( virtual/libintl )
-	nmap-update? ( dev-libs/apr dev-vcs/subversion )
-	ssl? ( dev-libs/openssl )
-"
-#use build-in lua. See bug #407091
-#	lua? ( >=dev-lang/lua-5.2[deprecated] )
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	# prevent unpacking the logo
-	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-liblua-ar.patch \
-		"${FILESDIR}"/${PN}-6.46-uninstaller.patch
-
-	sed -i \
-		-e 's/-m 755 -s ncat/-m 755 ncat/' \
-		ncat/Makefile.in || 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 zenmap) \
-		$(usex lua --with-liblua=included --without-liblua) \
-		$(use_with ncat) \
-		$(use_with ndiff) \
-		$(use_with nmap-update) \
-		$(use_with nping) \
-		$(use_with ssl openssl) \
-		--with-libdnet=included \
-		--with-pcre=/usr
-	#	--with-liblinear=/usr \
-	#	Commented because configure does weird things, while autodetection works
-}
-
-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 zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
-}