Improve initscript with USE=-auditor. Use correct init and conf files.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)

3 files changed, 17 insertions, 7 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index f405277aecdd..38ae6a4f1b0c 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/opendnssec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.31 2013/07/24 09:44:03 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.32 2013/07/24 22:11:40 mschiff Exp $
+
+*opendnssec-1.3.14-r1 (24 Jul 2013)
+
+  24 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.3.14.ebuild,
+  +opendnssec-1.3.14-r1.ebuild, files/opendnssec.initd-1.3.x:
+  Improve initscript with USE=-auditor. Use correct init and conf files.
 
 *opendnssec-1.3.14 (23 Jul 2013)
 
diff --git a/net-dns/opendnssec/files/opendnssec.initd-1.3.x b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
index dd11b0f757a1..7dc721ea184b 100644
--- a/net-dns/opendnssec/files/opendnssec.initd-1.3.x
+++ b/net-dns/opendnssec/files/opendnssec.initd-1.3.x
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.initd-1.3.x,v 1.1 2013/07/23 20:06:48 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/files/opendnssec.initd-1.3.x,v 1.2 2013/07/24 22:11:40 mschiff Exp $
 
 description="An open-source turn-key solution for DNSSEC"
 
@@ -11,6 +11,10 @@ depend() {
 }
 
 checkconfig() {
+	if [ -z "${CHECKCONFIG_BIN}" ]; then
+		# no config checker configured, skip config check
+		return 0
+	fi
 	if [ -x "${CHECKCONFIG_BIN}" ]; then
 		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
 		if [ -n "$output" ]; then
@@ -28,7 +32,6 @@ checkconfig() {
 	return 1
 }
 
-
 start_enforcer() {
 	if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
 		ebegin "Starting OpenDNSSEC Enforcer"
diff --git a/net-dns/opendnssec/opendnssec-1.3.14.ebuild b/net-dns/opendnssec/opendnssec-1.3.14-r1.ebuild
index 0d3ed90642ff..253375d0c68d 100644
--- a/net-dns/opendnssec/opendnssec-1.3.14.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.14.ebuild,v 1.1 2013/07/23 20:06:48 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.3.14-r1.ebuild,v 1.1 2013/07/24 22:11:40 mschiff Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://www.${PN}.org/files/source/${MY_P}.tar.gz"
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
+IUSE="+auditor +curl debug doc eppclient mysql +signer +sqlite test ${PKCS11_IUSE}"
 
 RDEPEND="
 	dev-lang/perl
@@ -178,8 +178,9 @@ src_install() {
 	fowners opendnssec:opendnssec /run/opendnssec
 
 	# install conf/init script
-	newinitd "${FILESDIR}"/opendnssec.initd opendnssec
-	newconfd "${FILESDIR}"/opendnssec.confd opendnssec
+	newinitd "${FILESDIR}"/opendnssec.initd-1.3.x opendnssec
+	newconfd "${FILESDIR}"/opendnssec.confd-1.3.x opendnssec
+	use auditor || sed -i 's/^CHECKCONFIG_BIN=.*/CHECKCONFIG_BIN=/' "${D}"/etc/conf.d/opendnssec
 }
 
 pkg_postinst() {