net-analyzer/suricata: add missing "|| die" guard to sed call
authorMarek Szuba <marecki@gentoo.org>
Thu, 23 Apr 2020 20:59:56 +0000 (21:59 +0100)
committerMarek Szuba <marecki@gentoo.org>
Thu, 23 Apr 2020 21:10:48 +0000 (22:10 +0100)
Also, some cosmetic changes to dependencies.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
net-analyzer/suricata/suricata-5.0.2.ebuild

index 19940f3c9fb285e532f6fc9254b3c7172010d598..b2dc6c2e8b0d671537c8da02821a38df56105053 100644 (file)
@@ -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
 }