commit: 140611c54bd679c154b4c6e90d03baf704fa28a3 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Wed Aug 5 13:31:25 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> 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 <jakov.smolic <AT> sartura.hr> Signed-off-by: Joonas Niilola <juippis <AT> 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 }
