net-analyzer/zmap: Version Bump, #494988; fix missing dep, #494990

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 132 insertions, 6 deletions

diff --git a/net-analyzer/zmap/ChangeLog b/net-analyzer/zmap/ChangeLog
index 6f74b8bd36af..c2307b797e2c 100644
--- a/net-analyzer/zmap/ChangeLog
+++ b/net-analyzer/zmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/zmap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/ChangeLog,v 1.3 2013/11/25 11:22:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/ChangeLog,v 1.4 2013/12/22 18:02:39 jlec Exp $
+
+*zmap-1.1.1 (22 Dec 2013)
+
+  22 Dec 2013; Justin Lecher <jlec@gentoo.org> zmap-1.1.0.ebuild,
+  +zmap-1.1.1.ebuild, zmap-9999.ebuild, +files/zmap-1.1.1-out-of-src.patch,
+  +files/zmap-9999-out-of-src.patch:
+  Version Bump, #494988; fix missing dep, #494990
 
   25 Nov 2013; Justin Lecher <jlec@gentoo.org> zmap-9999.ebuild:
   Add missing eclass
diff --git a/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch b/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch
new file mode 100644
index 000000000000..bd99ee31bb43
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-1.1.1-out-of-src.patch
@@ -0,0 +1,48 @@
+ CMakeLists.txt             | 2 +-
+ src/CMakeLists.txt         | 4 ++--
+ zmap_conf_install.cmake.in | 7 -------
+ 3 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aeb1c7f..0378f44 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,4 +67,4 @@ add_subdirectory(src)
+ FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*")
+ message(STATUS "${CONF_FILES}")
+ configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake)
+-install(SCRIPT "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
++install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6e51f12..2c1ae5a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,11 +75,11 @@ add_custom_command(OUTPUT zopt.h
+ 	)
+ 
+ add_custom_command(OUTPUT lexer.c
+-	COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" lexer.l
++	COMMAND flex -o "${CMAKE_CURRENT_BINARY_DIR}/lexer.c" --header-file="${CMAKE_CURRENT_BINARY_DIR}/lexer.h" "${CMAKE_CURRENT_SOURCE_DIR}/lexer.l"
+ 	)
+ 
+ add_custom_command(OUTPUT parser.c
+-	COMMAND byacc -d -o parser.c parser.y
++	COMMAND byacc -d -o "${CMAKE_CURRENT_BINARY_DIR}/parser.c" "${CMAKE_CURRENT_SOURCE_DIR}/parser.y"
+ 	)
+ 
+ add_executable(zmap ${SOURCES})
+diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
+index c1b2f61..695e7dd 100644
+--- a/zmap_conf_install.cmake.in
++++ b/zmap_conf_install.cmake.in
+@@ -1,10 +1,3 @@
+-message(STATUS "Creating /etc/zmap")
+-if (NOT EXISTS "/etc/zmap/")
+-        file(MAKE_DIRECTORY "/etc/zmap")
+-else()
+-        message(STATUS "/etc/zmap exists, skipping...")
+-endif()
+-
+ message(STATUS "Installing blacklist.conf...")
+ if (NOT EXISTS "/etc/zmap/blacklist.conf")
+         file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")
diff --git a/net-analyzer/zmap/files/zmap-9999-out-of-src.patch b/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
new file mode 100644
index 000000000000..7d281f8dbe00
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-9999-out-of-src.patch
@@ -0,0 +1,29 @@
+ CMakeLists.txt             | 2 +-
+ zmap_conf_install.cmake.in | 7 -------
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ebf9316..f18c112 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,4 +77,4 @@ add_subdirectory(src)
+ FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*")
+ message(STATUS "${CONF_FILES}")
+ configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake)
+-install(SCRIPT "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
++install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
+diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
+index 7f36f12..d5fe9d9 100644
+--- a/zmap_conf_install.cmake.in
++++ b/zmap_conf_install.cmake.in
+@@ -1,10 +1,3 @@
+-message(STATUS "Creating /etc/zmap")
+-if (NOT EXISTS "/etc/zmap/")
+-	file(MAKE_DIRECTORY "/etc/zmap")
+-else()
+-	message(STATUS "/etc/zmap exists, skipping...")
+-endif()
+-
+ message(STATUS "Installing blacklist.conf...")
+ if (NOT EXISTS "/etc/zmap/blacklist.conf")
+ 	file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")
diff --git a/net-analyzer/zmap/zmap-1.1.0.ebuild b/net-analyzer/zmap/zmap-1.1.0.ebuild
index 43ac9a430d29..85c612b3805f 100644
--- a/net-analyzer/zmap/zmap-1.1.0.ebuild
+++ b/net-analyzer/zmap/zmap-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-1.1.0.ebuild,v 1.1 2013/11/25 11:21:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-1.1.0.ebuild,v 1.2 2013/12/22 18:02:39 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/gengetopt
 	sys-devel/flex
-	virtual/yacc
+	dev-util/byacc
 "
 
 PATCHES=(
diff --git a/net-analyzer/zmap/zmap-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild
new file mode 100644
index 000000000000..c1096d7ef684
--- /dev/null
+++ b/net-analyzer/zmap/zmap-1.1.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-1.1.1.ebuild,v 1.1 2013/12/22 18:02:39 jlec Exp $
+
+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
+	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
+)
+
+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-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index 0f7cc4fc60e2..c9bc369e0c45 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-9999.ebuild,v 1.3 2013/11/25 11:22:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-9999.ebuild,v 1.4 2013/12/22 18:02:39 jlec Exp $
 
 EAPI=5
 
@@ -24,11 +24,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/gengetopt
 	sys-devel/flex
-	virtual/yacc
+	dev-util/byacc
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-out-of-src.patch
+	"${FILESDIR}"/${P}-out-of-src.patch
 )
 
 src_configure() {