net-dns/dnsdist: added useflags bug 672516 and initscript changes

Signed-off-by: Andreas Schuerch <nativemad@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/net-dns/dnsdist/dnsdist-1.3.3.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
similarity index 97%
rename from net-dns/dnsdist/dnsdist-1.3.3.ebuild
rename to net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
index b13e2bdae49d68c8ff1a7369282000cb2f313480..ed3b96e1ed6a2eeac4395d672d4c1c6498b997cb 100644 (file)
--- a/net-dns/dnsdist/dnsdist-1.3.3.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
 REQUIRED_USE="dnscrypt? ( ssl )
                gnutls? ( ssl )"
 
-DEPEND="
+RDEPEND="
        >=dev-libs/boost-1.35:=
        dev-libs/libedit:=
        fstrm? ( dev-libs/fstrm:= )
@@ -45,11 +45,14 @@ DEPEND="
        systemd? ( sys-apps/systemd:0= )
 "
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
        app-text/pandoc
        dev-util/ragel
+       dev-python/virtualenv
 "
 
 src_prepare() {

diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
index b13e2bdae49d68c8ff1a7369282000cb2f313480..ed3b96e1ed6a2eeac4395d672d4c1c6498b997cb 100644 (file)
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -28,7 +28,7 @@ IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
 REQUIRED_USE="dnscrypt? ( ssl )
                gnutls? ( ssl )"
 
-DEPEND="
+RDEPEND="
        >=dev-libs/boost-1.35:=
        dev-libs/libedit:=
        fstrm? ( dev-libs/fstrm:= )
@@ -45,11 +45,14 @@ DEPEND="
        systemd? ( sys-apps/systemd:0= )
 "
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
        app-text/pandoc
        dev-util/ragel
+       dev-python/virtualenv
 "
 
 src_prepare() {

diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index bfeef82d46f1540ce9ac7877dcd081cde64540b0..17c86ca431d49d3c6df8dc85b7ca8c10cadffbd8 100644 (file)
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configcheck"
@@ -25,14 +25,14 @@ depend() {
 }
 
 start() {
-       checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} 
+       checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP}
 
        configcheck || return 1
 
        ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
        start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-               -- -d -p ${PIDFILE} -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
-               -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} 
+               -b -- -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
+               -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
        eend $?
 }