6 files changed, 9 insertions, 136 deletions
diff --git a/net-analyzer/zmap/Manifest b/net-analyzer/zmap/Manifest
index 9adeccec0d63..1cbc0231a6c5 100644
--- a/net-analyzer/zmap/Manifest
+++ b/net-analyzer/zmap/Manifest
@@ -1,5 +1,2 @@
-DIST zmap-1.1.1.tar.gz 84325 SHA256 e3a740a97f217840b6afa81e2c84e11d44f91346cb9f2b21d0f5eda11fca5128 SHA512 daffd541b04d1c1e3e8cccbd3d08d881d2460b177524b5cafced388ebf7ea29343602f2540ba0430249cc0167ad370f1287f21f952c9254d98ce6213ba2288dd WHIRLPOOL a5882df618b1990be8bda2872175e33209cf9cedf003c2e619c4e136b4596e443f7b9a9d31b8abc2e520f8f502d9ba6b728b9fd9a320557b94e62aec09fb1a8a
-DIST zmap-1.1.2.tar.gz 84364 SHA256 3766b1cee8287184e4f475761b78633639e130fd004ae067ce4abf79b3a2da0d SHA512 b0f3834f30b97166576fb64814791f4aec1fa9326dfe965d65c66e7375cdeae48b6a25156c65a5af6a74e739df3964538d4c29b2d6e1c3d71b9ed3c756bb7821 WHIRLPOOL b6d0629f0aee3d6321c2179395fad97a2d5f0bb5e9cdf7a08606baf2d9bfe6f3bfe19e403147fd568a164a8d75c3e1db5f996e5d4ecdf9df366a3f1395681b3f
-DIST zmap-1.2.0.tar.gz 100594 SHA256 7658aef8338c592bebef82336f58598b2fa305d56779f6c81bffeef8c90472b0 SHA512 68fa49647444f18adfc86b4ee85ed3e93945611ca75687eedc259504e0d66edcded267b4fba9a975299984551c88193feacb850f46432d3f3f22f1430ed7c9bd WHIRLPOOL e4a50f86dfcae802d6b432e51c0f78ca37d56a3540326f076fcc002fbb23aeb85dbb57ad4a84b4b10d863f0f41b8d06510fdec1b9264d77c80cf0ffa69e5e01a
 DIST zmap-1.2.1.tar.gz 99840 SHA256 ff01f2b139e98a7e64ed2872ae332929c500dd6120888d57900fac82dccfeea8 SHA512 1b3d7fa41bb75c859463f3ec8bcde31778f5d91a6f561aa9638ba93be97dacdba89493574581ce52aebcf093a86b042dcce41cffe6cb0849bb76a6005b714be2 WHIRLPOOL 842ad32286883b554440dcb5ccfd8655997321612fd9ec49f591a6151819b6b605bc518281100c55ca8a9113819960710f870a745ebcb9994a6224b47d9a49ee
 DIST zmap-2.1.1.tar.gz 131689 SHA256 29627520c81101de01b0213434adb218a9f1210bfd3f2dcfdfc1f975dbce6399 SHA512 9d62dceff77fa20ff5945516b0766340366175947130bb844f19c11dac7676e658bcdedd6be29ffc945706aa3cdc0e4ac207bd127b618592769a4d3e75892857 WHIRLPOOL 09d7fb4e522b207b0b7f1d1ea9efcd9be49f7296d6c5e96858d795de61bf4a9d10ece07f7fa3bd56338dd3e410b5e474b51ed2c917a4b093fdc1689deec43d62
diff --git a/net-analyzer/zmap/zmap-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild
deleted file mode 100644
index 99fac3e6c5e1..000000000000
--- a/net-analyzer/zmap/zmap-1.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="json redis"
-
-RDEPEND="
-	dev-libs/gmp:0
-	net-libs/libpcap
-	json? ( dev-libs/json-c )
-	redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-devel/flex
-	dev-util/byacc"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-out-of-src.patch
-	"${FILESDIR}"/${P}-json-c.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DENABLE_HARDENING=OFF
-		$(cmake-utils_use_with json)
-		$(cmake-utils_use_with redis)
-		)
-	cmake-utils_src_configure
-}
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-1.1.2.ebuild b/net-analyzer/zmap/zmap-1.1.2.ebuild
deleted file mode 100644
index 2d594f6ebd92..000000000000
--- a/net-analyzer/zmap/zmap-1.1.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="json redis"
-
-RDEPEND="
-	dev-libs/gmp:0
-	net-libs/libpcap
-	json? ( dev-libs/json-c )
-	redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-devel/flex
-	dev-util/byacc"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-out-of-src.patch
-	"${FILESDIR}"/${PN}-1.1.1-json-c.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DENABLE_HARDENING=OFF
-		$(cmake-utils_use_with json)
-		$(cmake-utils_use_with redis)
-		)
-	cmake-utils_src_configure
-}
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-1.2.0.ebuild b/net-analyzer/zmap/zmap-1.2.0.ebuild
deleted file mode 100644
index 6b0059940854..000000000000
--- a/net-analyzer/zmap/zmap-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fcaps
-
-DESCRIPTION="Fast network scanner designed for Internet-wide network surveys"
-HOMEPAGE="https://zmap.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="json redis"
-
-RDEPEND="
-	dev-libs/gmp:0
-	net-libs/libpcap
-	json? ( dev-libs/json-c )
-	redis? ( dev-libs/hiredis )"
-DEPEND="${RDEPEND}
-	dev-util/gengetopt
-	sys-devel/flex
-	dev-util/byacc"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEVELOPMENT=OFF
-		-DENABLE_HARDENING=OFF
-		$(cmake-utils_use_with json)
-		$(cmake-utils_use_with redis)
-		)
-	cmake-utils_src_configure
-}
-
-FILECAPS=( cap_net_raw=ep usr/sbin/zmap )
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild
index 30d206f0734b..f1ac51819f8a 100644
--- a/net-analyzer/zmap/zmap-2.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-2.1.1.ebuild
@@ -18,7 +18,7 @@ IUSE="json mongo redis"
 RDEPEND="
 	dev-libs/gmp:0
 	net-libs/libpcap
-	json? ( dev-libs/json-c )
+	dev-libs/json-c
 	mongo? ( dev-db/mongodb )
 	redis? ( dev-libs/hiredis )"
 DEPEND="${RDEPEND}
@@ -38,9 +38,8 @@ src_configure() {
 		-DENABLE_DEVELOPMENT=OFF
 		-DENABLE_HARDENING=OFF
 		-DWITH_WERROR=OFF
-		-DWITH_json="$(usex json)"
-		-DWITH_json="$(usex mongo)"
-		-DWITH_json="$(usex redis)"
+		-DWITH_mongo="$(usex mongo)"
+		-DWITH_redis="$(usex redis)"
 		)
 	cmake-utils_src_configure
 }
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 05f9c807f902..c20be04b9149 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils fcaps git-r3
 
@@ -14,12 +14,13 @@ EGIT_REPO_URI="git://github.com/zmap/zmap.git"
 SLOT="0"
 LICENSE="Apache-2.0"
 KEYWORDS=""
-IUSE="json redis"
+IUSE="mongo redis"
 
 RDEPEND="
 	dev-libs/gmp:0
 	net-libs/libpcap
-	json? ( dev-libs/json-c )
+	dev-libs/json-c
+	mongo? ( dev-db/mongo )
 	redis? ( dev-libs/hiredis )"
 DEPEND="${RDEPEND}
 	dev-util/gengetopt
@@ -32,8 +33,8 @@ src_configure() {
 		-DENABLE_DEVELOPMENT=OFF
 		-DENABLE_HARDENING=OFF
 		-DWITH_WERROR=OFF
-		$(cmake-utils_use_with json)
-		$(cmake-utils_use_with redis)
+		-DWITH_mongo="$(usex mongo)"
+		-DWITH_redis="$(usex redis)"
 		)
 	cmake-utils_src_configure
 }