From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A07D7138359 for ; Sun, 16 Aug 2020 08:01:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0266E0814; Sun, 16 Aug 2020 08:01:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9AD84E0814 for ; Sun, 16 Aug 2020 08:01:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C578534F337 for ; Sun, 16 Aug 2020 08:01:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4886724C for ; Sun, 16 Aug 2020 08:01:19 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1597564856.140611c54bd679c154b4c6e90d03baf704fa28a3.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zmap/zmap-2.1.1.ebuild net-analyzer/zmap/zmap-9999.ebuild X-VCS-Directories: net-analyzer/zmap/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 140611c54bd679c154b4c6e90d03baf704fa28a3 X-VCS-Branch: master Date: Sun, 16 Aug 2020 08:01:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 58c20e62-4336-493f-b45d-281e3880f474 X-Archives-Hash: d74c11ce0590063305507ffdcc2c32ae commit: 140611c54bd679c154b4c6e90d03baf704fa28a3 Author: Jakov Smolic sartura hr> AuthorDate: Wed Aug 5 13:31:25 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Aug 16 08:00:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=140611c5 net-analyzer/zmap: update mycmakeargs, drop mongodb dep in 9999 - Mongo support was removed in https://github.com/zmap/zmap/pull/467 Closes: https://bugs.gentoo.org/677902 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: Joonas Niilola gentoo.org> net-analyzer/zmap/zmap-2.1.1.ebuild | 7 +++---- net-analyzer/zmap/zmap-9999.ebuild | 9 +++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild index bab11e96bbf..dac6ede5634 100644 --- a/net-analyzer/zmap/zmap-2.1.1.ebuild +++ b/net-analyzer/zmap/zmap-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,10 +35,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DENABLE_DEVELOPMENT=OFF - -DENABLE_HARDENING=OFF -DWITH_WERROR=OFF - -DWITH_mongo="$(usex mongo)" - -DWITH_redis="$(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 eaed24c6933..04e4602032d 100644 --- a/net-analyzer/zmap/zmap-9999.ebuild +++ b/net-analyzer/zmap/zmap-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,13 +13,12 @@ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" SLOT="0" LICENSE="Apache-2.0" KEYWORDS="" -IUSE="mongo redis" +IUSE="redis" RDEPEND=" dev-libs/gmp:0 net-libs/libpcap dev-libs/json-c:= - mongo? ( dev-db/mongodb ) redis? ( dev-libs/hiredis )" DEPEND="${RDEPEND} dev-util/gengetopt @@ -30,10 +29,8 @@ DEPEND="${RDEPEND} src_configure() { local mycmakeargs=( -DENABLE_DEVELOPMENT=OFF - -DENABLE_HARDENING=OFF -DWITH_WERROR=OFF - -DWITH_mongo="$(usex mongo)" - -DWITH_redis="$(usex redis)" + -DWITH_REDIS="$(usex redis)" ) cmake-utils_src_configure }