[gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/

[Marek Szuba]

commit:     a061032bd203f7986591189957a1008aecc9268a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 20:59:56 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 21:10:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a061032b

net-analyzer/suricata: add missing "|| die" guard to sed call

Also, some cosmetic changes to dependencies.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-analyzer/suricata/suricata-5.0.2.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/suricata/suricata-5.0.2.ebuild b/net-analyzer/suricata/suricata-5.0.2.ebuild
index 19940f3c9fb..b2dc6c2e8b0 100644
--- a/net-analyzer/suricata/suricata-5.0.2.ebuild
+++ b/net-analyzer/suricata/suricata-5.0.2.ebuild
@@ -22,7 +22,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( lua luajit )
 	bpf? ( af-packet )"
 
-CDEPEND="acct-group/suricata
+RDEPEND="${PYTHON_DEPS}
+	acct-group/suricata
 	acct-user/suricata
 	dev-libs/jansson
 	dev-libs/libpcre
@@ -32,7 +33,7 @@ CDEPEND="acct-group/suricata
 	dev-libs/nspr
 	dev-libs/nss
 	$(python_gen_cond_dep '
-		dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
 	')
 	>=net-libs/libhtp-0.5.32
 	net-libs/libpcap
@@ -48,11 +49,9 @@ CDEPEND="acct-group/suricata
 	nflog?      ( net-libs/libnetfilter_log )
 	nfqueue?    ( net-libs/libnetfilter_queue )
 	redis?      ( dev-libs/hiredis )"
-DEPEND="${CDEPEND}
+DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.69-r5
 	virtual/rust"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch"
@@ -74,7 +73,7 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am"
+	sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die
 	eautoreconf
 }