summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schuerch <nativemad@gentoo.org>2019-03-30 11:00:21 +0100
committerAndreas Schuerch <nativemad@gentoo.org>2019-03-30 11:02:12 +0100
commit198b4ec0e6d0d24464a31896012aa358c8beb941 (patch)
tree28ac15a1ae40eaeb64ffa2ffb08a8fabb6a8de65 /net-dns/dnsdist
parentmedia-sound/abcm2ps: EAPI-7 bump (diff)
downloadgentoo-198b4ec0e6d0d24464a31896012aa358c8beb941.tar.gz
gentoo-198b4ec0e6d0d24464a31896012aa358c8beb941.tar.bz2
gentoo-198b4ec0e6d0d24464a31896012aa358c8beb941.zip
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
Diffstat (limited to 'net-dns/dnsdist')
-rw-r--r--net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild (renamed from net-dns/dnsdist/dnsdist-1.3.3.ebuild)7
-rw-r--r--net-dns/dnsdist/dnsdist-9999.ebuild7
-rw-r--r--net-dns/dnsdist/files/dnsdist.initd8
3 files changed, 14 insertions, 8 deletions
diff --git a/net-dns/dnsdist/dnsdist-1.3.3.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
index b13e2bdae49d..ed3b96e1ed6a 100644
--- 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 b13e2bdae49d..ed3b96e1ed6a 100644
--- 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 bfeef82d46f1..17c86ca431d4 100644
--- 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 $?
}