Bump revision, Improve confd and initd file

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

4 files changed, 10 insertions, 101 deletions

diff --git a/net-dns/opendnssec/ChangeLog b/net-dns/opendnssec/ChangeLog
index f897af7deb01..b0baca88c542 100644
--- a/net-dns/opendnssec/ChangeLog
+++ b/net-dns/opendnssec/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2013/07/08 11:43:49 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/ChangeLog,v 1.27 2013/07/23 20:00:56 mschiff Exp $
+
+*opendnssec-1.4.1-r1 (23 Jul 2013)
+
+  23 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.4.1.ebuild,
+  +opendnssec-1.4.1-r1.ebuild, -files/opendnssec.confd.14,
+  -files/opendnssec.initd.14:
+  Bump revision, Improve confd and initd file
 
   08 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org> -opendnssec-1.3.13.ebuild,
   -opendnssec-1.4.0.ebuild, +opendnssec-1.4.1.ebuild,
diff --git a/net-dns/opendnssec/files/opendnssec.confd.14 b/net-dns/opendnssec/files/opendnssec.confd.14
deleted file mode 100644
index 73e79e1c4e4b..000000000000
--- a/net-dns/opendnssec/files/opendnssec.confd.14
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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.confd.14,v 1.1 2013/05/12 22:03:21 mschiff Exp $
-
-# Variables containing default binaries used in the opendnssec
-# initscript. You can alter them to another applications/paths
-# if required.
-
-CHECKCONFIG_BIN=/usr/bin/ods-kaspcheck
-CONTROL_BIN=/usr/sbin/ods-control
-ENFORCER_BIN=/usr/sbin/ods-enforcerd
-SIGNER_BIN=/usr/sbin/ods-signerd
diff --git a/net-dns/opendnssec/files/opendnssec.initd.14 b/net-dns/opendnssec/files/opendnssec.initd.14
deleted file mode 100644
index f20618e8abbe..000000000000
--- a/net-dns/opendnssec/files/opendnssec.initd.14
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/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.14,v 1.1 2013/05/12 22:03:21 mschiff Exp $
-
-description="An open-source turn-key solution for DNSSEC"
-
-depend() {
-	need net
-	use logger
-}
-
-checkconfig() {
-	if [ -x "${CHECKCONFIG_BIN}" ]; then
-		output=$(${CHECKCONFIG_BIN} 2>&1| grep -v -E "^/etc/opendnssec/(conf|kasp).xml validates")
-		if [ -n "$output" ]; then
-			echo $output
-		fi
-
-		errors=$(echo $output | grep ERROR | wc -l)
-		if [ $errors -gt 0 ]; then
-			ewarn "$errors error(s) found in OpenDNSSEC configuration."
-		fi
-		return $errors
-	fi
-	eerror "Unable to execute ${CHECKCONFIG_BIN:-config binary}"
-	# can't validate config, just die
-	return 1
-}
-
-
-start_enforcer() {
-	if [ -n "${ENFORCER_BIN}" ] && [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer start > /dev/null
-		eend $?
-	else
-		if [ -n "${ENFORCER_BIN}" ]; then
-			eerror "OpenDNSSEC Enforcer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Enforcer not used."
-	fi
-}
-
-stop_enforcer() {
-	if [ -x "${ENFORCER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Enforcer"
-		${CONTROL_BIN} enforcer stop > /dev/null
-		eend $?
-	fi
-}
-
-start_signer() {
-	if [ -n "${SIGNER_BIN}" ] && [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Starting OpenDNSSEC Signer"
-		${CONTROL_BIN} signer start > /dev/null 2>&1
-		eend $?
-	else
-		if [ -n "${SIGNER_BIN}" ]; then
-			eerror "OpenDNSSEC Signer binary not executable"
-			return 1
-		fi
-		einfo "OpenDNSSEC Signer not used."
-	fi
-}
-
-stop_signer() {
-	if [ -x "${SIGNER_BIN}" ]; then
-		ebegin "Stopping OpenDNSSEC Signer"
-		${CONTROL_BIN} signer stop > /dev/null 2>&1
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return $?
-	start_enforcer || return $?
-	start_signer || return $?
-}
-
-stop() {
-	stop_signer
-	stop_enforcer
-	sleep 5
-}
diff --git a/net-dns/opendnssec/opendnssec-1.4.1.ebuild b/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild
index 9811b9152e79..3c105618cb77 100644
--- a/net-dns/opendnssec/opendnssec-1.4.1.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4.1.ebuild,v 1.1 2013/07/08 11:43:49 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/opendnssec/opendnssec-1.4.1-r1.ebuild,v 1.1 2013/07/23 20:00:56 mschiff Exp $
 
-EAPI=4
+EAPI=5
 
 MY_P="${P/_}"
 PKCS11_IUSE="+softhsm opensc external-hsm"