Convert the init script from myservice to SVCNAME and allow . and - as separator in multiple instances mode.

Package-Manager: portage-2.1.1_pre5-r1

3 files changed, 27 insertions, 23 deletions

diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 82f36fed89fb..97647ec3bb92 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.34 2006/07/11 04:32:42 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.35 2006/08/15 19:35:52 swegener Exp $
+
+  15 Aug 2006; Sven Wegener <swegener@gentoo.org> files/pdns:
+  Convert the init script from myservice to SVCNAME and allow . and - as
+  separator in multiple instances mode.
 
   11 Jul 2006; Joshua Jackson <tsunam@gentoo.org> pdns-2.9.20-r1.ebuild:
   Stable x86 ;bug #136288
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index f340e0ea0580..6647f39734b8 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -13,10 +13,10 @@ AUX 2.9.20-ldap-deprecated.patch 457 RMD160 edcb367abfc83853e4739cc6646ca593ae7d
 MD5 2cc96f8436323eca57fb95a63ea39efd files/2.9.20-ldap-deprecated.patch 457
 RMD160 edcb367abfc83853e4739cc6646ca593ae7d5e9e files/2.9.20-ldap-deprecated.patch 457
 SHA256 862728373669f7ea5544de7021c394cc0efa3ff5c65551d6657dad85cb654097 files/2.9.20-ldap-deprecated.patch 457
-AUX pdns 1240 RMD160 440800aa4016fa189c570c8e450c9e2bbedd9ce2 SHA1 9838ebe821761c7212aaff831a0af59ea7be02e0 SHA256 ed721725cab389e5974101bd7299db11acc8041e03b618a7bec06897b53f6f06
-MD5 48c6fbf4d7bf45ffa9600d7e84fa6f96 files/pdns 1240
-RMD160 440800aa4016fa189c570c8e450c9e2bbedd9ce2 files/pdns 1240
-SHA256 ed721725cab389e5974101bd7299db11acc8041e03b618a7bec06897b53f6f06 files/pdns 1240
+AUX pdns 1239 RMD160 f93c9433ab4bfa0ac99ce7cdd271bd8ed17eacc3 SHA1 a8708f242bc87286a6f20be9a3a12a3ee9a9a864 SHA256 7661254d3a82ee8f51998fdfe0bce8dde7923c593cac01c17a2d5211b2f5a12c
+MD5 6fa5c2c010c4375afd1687a92d84e9bc files/pdns 1239
+RMD160 f93c9433ab4bfa0ac99ce7cdd271bd8ed17eacc3 files/pdns 1239
+SHA256 7661254d3a82ee8f51998fdfe0bce8dde7923c593cac01c17a2d5211b2f5a12c files/pdns 1239
 AUX precursor 488 RMD160 f6805c9603959c22a4cc8b7a33e3fbf7ff58cd04 SHA1 bcd434a5b185673eb751d2b8e057898c50910c81 SHA256 a9c7af4dcc8cf51c8a4cc0e3ca94ca6e9da13dbd6f69bf9169e23790b831da32
 MD5 8e0042dfb20242b87780089a6ace2faf files/precursor 488
 RMD160 f6805c9603959c22a4cc8b7a33e3fbf7ff58cd04 files/precursor 488
@@ -35,10 +35,10 @@ EBUILD pdns-2.9.20-r1.ebuild 2861 RMD160 8d379e5dc4441f0a6ea6044fc2668cf6b965f3a
 MD5 a547b477425b27eb832f230f3a1036e6 pdns-2.9.20-r1.ebuild 2861
 RMD160 8d379e5dc4441f0a6ea6044fc2668cf6b965f3a3 pdns-2.9.20-r1.ebuild 2861
 SHA256 eaae4ff4dea6a8564dff5949d54e75247f423e3566c1ffa674fd347939cb7840 pdns-2.9.20-r1.ebuild 2861
-MISC ChangeLog 5938 RMD160 9e17a198baeb0e16081bc917cf7cfa721ddda47d SHA1 1b3e31857822e0a3c0d66bb500c2c42c8276abe1 SHA256 395acaeb764ef560879cccdbc711d92156787064d6835e620ca0217a0004dff1
-MD5 de2143d070121127e3de404724724064 ChangeLog 5938
-RMD160 9e17a198baeb0e16081bc917cf7cfa721ddda47d ChangeLog 5938
-SHA256 395acaeb764ef560879cccdbc711d92156787064d6835e620ca0217a0004dff1 ChangeLog 5938
+MISC ChangeLog 6116 RMD160 25f4e07bf549217eea2646746a1dc59a5f22b3cd SHA1 1a2f0b1815aa523b3904a41903c0fdd040fa042a SHA256 31fc536f074907dd1adfe9dc427f2e999a075c5f58c8b409c9da145ce6242e7e
+MD5 5d3f72ddba529bd77c104e7b50227a03 ChangeLog 6116
+RMD160 25f4e07bf549217eea2646746a1dc59a5f22b3cd ChangeLog 6116
+SHA256 31fc536f074907dd1adfe9dc427f2e999a075c5f58c8b409c9da145ce6242e7e ChangeLog 6116
 MISC metadata.xml 573 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 SHA1 01c4329b63991b54af3559d2220251520cb7147a SHA256 26a6150230ca87a16d882d1cdac565a040e75e7bf02ee9348688569924e1bfc3
 MD5 56567ddcaf248499457a1ce74277c910 metadata.xml 573
 RMD160 74995a273e6513bb6689ec0ad74bf5b0b0fdf5c1 metadata.xml 573
@@ -50,9 +50,9 @@ MD5 4d4c82f77383d45b0f3c812506353f02 files/digest-pdns-2.9.20-r1 235
 RMD160 dcc067109bce2032ef801cb2f77a19cf70b863dc files/digest-pdns-2.9.20-r1 235
 SHA256 d2ac1f7a38f80ff664956d619e704adceb479b42cb6f1b792d48efe666bb51f2 files/digest-pdns-2.9.20-r1 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEsyoI2ZWR0Jhg/EsRAj8kAJ9rnreYwbPsjH5JbbvQdXTrejzU3ACdETpv
-GbojnhUQJn7Sf7gLZqrhJ/s=
-=Wdri
+iD8DBQFE4iIhI1lqEGTUzyQRAmEeAJ9Xirsk4iWiSgoXHNJkqwfW25t7AQCgpihV
+80j2U/RdqirVMqWF4Xt0zw0=
+=DUX0
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/files/pdns b/net-dns/pdns/files/pdns
index 3e7826027b24..2d8373b3475b 100644
--- a/net-dns/pdns/files/pdns
+++ b/net-dns/pdns/files/pdns
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.7 2006/04/30 00:14:14 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/files/pdns,v 1.8 2006/08/15 19:35:52 swegener Exp $
 
 opts="${opts} reload monitor dump"
 
@@ -10,9 +10,9 @@ PDNS_INSTANCE="default"
 PDNS_CONFIG=""
 
 # Multiple instances support
-if [[ "${myservice:0:5}" = "pdns-" && -n "${myservice:5}" ]]
+if [[ ${SVCNAME:0:5} = pdns[.-] && -n ${SVCNAME:5} ]]
 then
-	PDNS_INSTANCE="${myservice:5}"
+	PDNS_INSTANCE="${SVCNAME:5}"
 	PDNS_CONFIG="--config-name=${PDNS_INSTANCE}"
 fi
 
@@ -22,7 +22,7 @@ depend() {
 
 start() {
 	ebegin "Starting PowerDNS (${PDNS_INSTANCE})"
-	/usr/sbin/pdns_server ${PDNS_CONFIG} --daemon --guardian=yes
+	/usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=yes --guardian=yes
 	eend $?
 }
 
@@ -38,14 +38,14 @@ reload() {
 	eend $?
 }
 
-monitor() {
-       ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
-       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console --loglevel=9
-       eend $?
-}
-
 dump() {
        ebegin "Dumping PowerDNS (${PDNS_INSTANCE}) variables"
        /usr/bin/pdns_control ${PDNS_CONFIG} list
        eend $?
 }
+
+monitor() {
+       ebegin "Starting PowerDNS (${PDNS_INSTANCE}) in monitor mode"
+       /usr/sbin/pdns_server ${PDNS_CONFIG} --daemon=no --guardian=no --control-console=yes --loglevel=9
+       eend $?
+}