net-analyzer/zmap: Backport patch for json-c's pkg-config file rename, #496364

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

5 files changed, 37 insertions, 46 deletions

diff --git a/net-analyzer/zmap/ChangeLog b/net-analyzer/zmap/ChangeLog
index c2307b797e2c..29ee10f4f3ac 100644
--- a/net-analyzer/zmap/ChangeLog
+++ b/net-analyzer/zmap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2013/12/22 18:02:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/ChangeLog,v 1.5 2013/12/30 09:58:06 jlec Exp $
+
+  30 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-json-c.patch:
+  Backport patch for json-c's pkg-config file rename, #496364
 
 *zmap-1.1.1 (22 Dec 2013)
 
diff --git a/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch b/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch
new file mode 100644
index 000000000000..d5f7e3c04ae9
--- /dev/null
+++ b/net-analyzer/zmap/files/zmap-1.1.1-json-c.patch
@@ -0,0 +1,28 @@
+From 08c00b66555612ed69d7f253b277f44cf8da0c62 Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Mon, 30 Dec 2013 10:50:34 +0100
+Subject: [PATCH] Fix name of josn-c pkg-config file
+
+Over 2 years ago json-c renamed its pc file from json.pc -> json-c.pc.
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ebf9316..a9c8e5a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,7 @@ endif()
+ 
+ if(WITH_JSON)
+ 	include(FindPkgConfig)
+-	pkg_check_modules(JSON json)
++	pkg_check_modules(JSON json-c)
+ 	if(JSON_FOUND)
+ 		include_directories(JSON_INCLUDE_DIRS)
+ 	else()
+-- 
+1.8.5.2
+
diff --git a/net-analyzer/zmap/zmap-1.1.0.ebuild b/net-analyzer/zmap/zmap-1.1.0.ebuild
deleted file mode 100644
index 85c612b3805f..000000000000
--- a/net-analyzer/zmap/zmap-1.1.0.ebuild
+++ /dev/null
@@ -1,43 +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/zmap/zmap-1.1.0.ebuild,v 1.2 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-1.1.1.ebuild b/net-analyzer/zmap/zmap-1.1.1.ebuild
index c1096d7ef684..41c254283ee7 100644
--- a/net-analyzer/zmap/zmap-1.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-1.1.1.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.1.ebuild,v 1.1 2013/12/22 18:02:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-1.1.1.ebuild,v 1.2 2013/12/30 09:58:06 jlec Exp $
 
 EAPI=5
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-out-of-src.patch
+	"${FILESDIR}"/${P}-json-c.patch
 )
 
 src_configure() {
diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index c9bc369e0c45..b0f02dee3031 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.4 2013/12/22 18:02:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zmap/zmap-9999.ebuild,v 1.5 2013/12/30 09:58:06 jlec Exp $
 
 EAPI=5
 
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-out-of-src.patch
+	"${FILESDIR}"/${PN}-1.1.1-json-c.patch
 )
 
 src_configure() {