Update initscript and confdscript to allow more options settings.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

4 files changed, 27 insertions, 24 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index 1adbdf680b36..e6381b779c5e 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.113 2010/11/04 11:35:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.114 2010/11/04 14:22:45 scarabeus Exp $
+
+  04 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> files/quasselcore.conf,
+  files/quasselcore.init:
+  Update initscript and confdscript to allow more options settings.
 
   04 Nov 2010; Markus Meier <maekke@gentoo.org> quassel-0.7.1.ebuild:
   x86 stable, bug #341637
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 15bd3c26c7a3..d9c13d56d53c 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX quassel.logrotate 105 RMD160 42bde4a3d8a899971037b1e2d0ddfb5b136f065e SHA1 c4ddd2cebd364c213ed4443e5bf8bd2ae3b17ad9 SHA256 00c32e857d7a4346d09ac057768565692da9cacf41ed37cc7e357b395e033a45
 AUX quasselcore-2.conf 756 RMD160 5f7ec7d1e46da202fdc18e2bd25827d307ec15fc SHA1 688039bd9616177eab803b7a4b12945e009cc806 SHA256 48079bebba2e723d582751b63b5d696ba506b364d20268c38f565f2c85257baa
 AUX quasselcore-2.init 1693 RMD160 729dad48f3cb5afd35bb76c731349109becee392 SHA1 f1a83d63398b3df5e7700921db22d76595a3a96c SHA256 5632cfbb1921561924af1d50196e0e9d1bb80caa90f5d98e551af7c30174458a
-AUX quasselcore.conf 496 RMD160 328fa5c018107a34e67a681da79f87c42c16bca5 SHA1 2a4cf7f8b1798fadbd6b42273d3b9a32470bb8a9 SHA256 120a7664ce3819164beeae973c2c950b462844b80fe38240b3de48514797cbf2
-AUX quasselcore.init 1802 RMD160 c170596dd415d32d3147b6cf1a263a48f4b12268 SHA1 87a62fa64d16edaa6d8435490259b0e452b2a80f SHA256 4f79a3cc0b8842309c3f65d154dba1a434f33a36cc140bac10387ad1f16b5ad6
+AUX quasselcore.conf 714 RMD160 96e0d621deb67f4901840f89aa483f42504ed675 SHA1 b75f8e5967aec6457cf20f8481c518eeeee16a35 SHA256 16cfaf919268ee3c3281fc4ad0dfc128b1c98f5edfc5cc522addd512f36d293c
+AUX quasselcore.init 1868 RMD160 1178e2879f88a828aba354893e2c6db2b68c1198 SHA1 c229a580b8a2f47ac922fd8807573b609ce723a1 SHA256 ee2dde641cd1e2d399313f2459f5e251960f35f093a73e8fde87f7a4782f2735
 DIST quassel-0.6.3.tar.bz2 2584143 RMD160 816bc57a0c019482a0f6b000892119afc0afb441 SHA1 4532bd7d5d164883b97d4c86a4986b40d9645e40 SHA256 79259da9b36dc6a1b30724a0687fa2eac19354a9be6235af016329870e193f22
 DIST quassel-0.7.1.tar.bz2 2714990 RMD160 d82cbfafa9fe27119b1fa66cfa417b688b6e8e7e SHA1 791086da977033a1bbee3effa317668b3726bd7f SHA256 914a9cd21bfe4be1f78b2f6c96e54b52db7ed3c0adc4dce6bfabec38a30f7ecd
 EBUILD quassel-0.6.3.ebuild 2902 RMD160 6cf6f255f2ff74cfcb70dc23cb426361df3424b0 SHA1 3408beeee988969c4a40034f2e44894681a49032 SHA256 a567e61a8b5f8402dcbc31a2544ac42630e2f3b3320a73197b7042a3bda6be6b
 EBUILD quassel-0.7.1.ebuild 4799 RMD160 0edd806bd5aa2262b5c3175b99c5a7ceec055e48 SHA1 9722792af97cde3c8c83a5b7bac2450eca336929 SHA256 805804d2e710b2b463449820734064d25838ba091968aa65ae31091dc42a12a8
 EBUILD quassel-9999.ebuild 4780 RMD160 819b05d177a05970dfdde573fe765e9696905216 SHA1 851b0d1ca96f19607ddc14dd7f06578107004330 SHA256 a3dc0f9dcc8a759358d785191493d2e94e39ca298de98ea2dad992db5f4f38c2
-MISC ChangeLog 19219 RMD160 ea0f71d97e52f5d1765f1d01c55da6bc26765b7d SHA1 ea8940db0a8aa70a73127ffc2f2e5bb1d6d22e49 SHA256 10ef732b304b97e93064d54ddde90a60dc0d449c6b266cf0d238d956043f7f1d
+MISC ChangeLog 19396 RMD160 8444904809c690326eb59a7cd7030fda9d0da55d SHA1 d9e99323095435def52440ba1ea88be72f35ddbf SHA256 5a521e0af26faa005954b2219f63576b1f6b9a4c2e055fd6a21c3b8aae70af2f
 MISC metadata.xml 1777 RMD160 a7056cd2fbca953cdbe5462aac48697a98ef628b SHA1 7bea6bda0bafaff84bf2c931d65133ce07a3c6e1 SHA256 0e1dedf188fb5600f39cea0b61809b73362cd0d42068ed42cd2da5591dbb731c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzSmkcACgkQkKaRLQcq0GJ1EwCdEIM5w8ZuMZelfcf6j7qefrly
-TOwAoJRsZvqSD9wTtGyM9QKiE2P7rYtc
-=FgSS
------END PGP SIGNATURE-----
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
index e677b4026b5e..c68733777527 100644
--- a/net-irc/quassel/files/quasselcore.conf
+++ b/net-irc/quassel/files/quasselcore.conf
@@ -1,13 +1,22 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.conf,v 1.4 2010/07/01 10:34:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.conf,v 1.5 2010/11/04 14:22:44 scarabeus Exp $
 
 # Loglevel Debug|Info|Warning|Error. Default is: Info
 # The logfile is located at /var/log/quassel.log.
-LOGLEVEL="Info"
+#LOGLEVEL="Info"
 
 # The address(es) quasselcore will listen on. Default is 0.0.0.0
-LISTEN="0.0.0.0"
+#LISTEN="0.0.0.0"
 
 # The port quasselcore will listen at. Default is: 4242
-PORT="4242"
+#PORT="4242"
+
+# User we want our daemon to run under.
+#USER="quassel"
+
+# Directory we store all quasselcore content.
+#CONFIGDIR="/var/lib/quassel"
+
+# File quasselcore will log all its events into.
+#LOGFILE="/var/log/quassel.log"
\ No newline at end of file
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
index 57d79ccf96c1..e1059e791f04 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,18 +1,18 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.6 2010/07/03 10:30:55 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.7 2010/11/04 14:22:45 scarabeus Exp $
 
 depend() {
-	need net
-	use postgres
+	need localmount net
+	after bootmisc postgres
 }
 
-LOGFILE="/var/log/quassel.log"
 CORE="$(which quasselcore)"
 PID="/var/run/quassel.pid"
-CONFIGDIR="/var/lib/quassel"
-QUASSEL_USER="quassel"
+LOGFILE=${LOGFILE:-"/var/log/quassel.log"}
+CONFIGDIR=${CONFIGDIR:-"/var/lib/quassel"}
+QUASSEL_USER=${QUASSEL_USER:-"quassel"}
 
 checkconfig() {
 	# set defaults