Add init script and some other enhancements from Daniel Pielmeier in bug #217510

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo i686)

7 files changed, 92 insertions, 18 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index f6ca9a32d187..6ec075dc69a5 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.22 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.23 2008/08/26 12:01:44 jokey Exp $
+
+  26 Aug 2008; Markus Ullmann <jokey@gentoo.org> +files/quasselcore.conf,
+  +files/quasselcore.init, metadata.xml, quassel-0.2.0_rc1.ebuild,
+  quassel-0.2.9999.ebuild, quassel-9999-r1.ebuild:
+  Add init script and some other enhancements from Daniel Pielmeier in bug
+  #217510
 
   02 Jul 2008; Diego Pettenò <flameeyes@gentoo.org>
   quassel-0.2.0_rc1.ebuild, quassel-0.2.9999.ebuild, quassel-9999-r1.ebuild:
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
new file mode 100644
index 000000000000..8ac3f1095c69
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.conf
@@ -0,0 +1,14 @@
+# /etc/conf.d/quasselcore
+
+QUASSEL_USER=""
+
+#Available options (QUASSEL_OPTS) for quasselcore:
+#--port -p			The port quasselcore will listen at. Default 4242
+#--norestore -n		Don't restore last core's state
+#--logfile -l		Path to logfile
+#--loglevel -L		Loglevel Debug|Info|Warning|Error. Default Info
+#--datadir -0		Specify the directory holding datafiles like the Sqlite DB and the SSL Cert
+
+#QUASSEL_OPTS="--logfile=/var/log/quassel.log"
+#Does not work now, because of missing write permission to /var/log.
+#Maybe creating /var/log/quassel with appropiate permissions will do the trick.
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
new file mode 100644
index 000000000000..8f1e98698ee8
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore.init
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2008 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.1 2008/08/26 12:01:44 jokey Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting Quassel Core"
+	start-stop-daemon --start --user $QUASSEL_USER --background --make-pidfile \
+	--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Quassel Core"
+	start-stop-daemon --stop --user $QUASSEL_USER --pidfile /var/run/quassel.pid \
+	--exec /usr/bin/quasselcore
+	eend $?
+}
diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 7aa31fc6f9eb..0886842dc82a 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>net-irc</herd>
   <maintainer>
-    <email>flameeyes@gentoo.org</email>
+    <email>jokey@gentoo.org</email>
   </maintainer>
   <use>
     <flag name="X">
diff --git a/net-irc/quassel/quassel-0.2.0_rc1.ebuild b/net-irc/quassel/quassel-0.2.0_rc1.ebuild
index ce21c392927f..9400345a0ebf 100644
--- a/net-irc/quassel/quassel-0.2.0_rc1.ebuild
+++ b/net-irc/quassel/quassel-0.2.0_rc1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild,v 1.2 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.0_rc1.ebuild,v 1.3 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -87,4 +87,16 @@ src_install() {
 			newins "${S}"/src/icons/quassel/connected/${size}.png quassel.png
 		done
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }
diff --git a/net-irc/quassel/quassel-0.2.9999.ebuild b/net-irc/quassel/quassel-0.2.9999.ebuild
index 2b63aed30e01..4ea4548248b2 100644
--- a/net-irc/quassel/quassel-0.2.9999.ebuild
+++ b/net-irc/quassel/quassel-0.2.9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild,v 1.4 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.2.9999.ebuild,v 1.5 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -85,4 +85,16 @@ src_install() {
 		# avoid the connected/ directory, get only the ${size}x${size}
 		doins -r "${S}"/src/icons/quassel/*x*
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }
diff --git a/net-irc/quassel/quassel-9999-r1.ebuild b/net-irc/quassel/quassel-9999-r1.ebuild
index d297f730b8ac..aa93182fcc2b 100644
--- a/net-irc/quassel/quassel-9999-r1.ebuild
+++ b/net-irc/quassel/quassel-9999-r1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild,v 1.4 2008/07/02 22:52:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999-r1.ebuild,v 1.5 2008/08/26 12:01:44 jokey Exp $
 
 EAPI=1
 
 inherit cmake-utils eutils
 
 if [[ ${PV} == *9999 ]]; then
-	inherit git
 	EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
 
 	case ${PV} in
 		0.2.9999) EGIT_BRANCH="0.2" ;;
 		*) EGIT_BRANCH="master"
 	esac
+	inherit git
 else
 	MY_P="${P/_/-}"
 	SRC_URI="http://quassel-irc.org/system/files/${MY_P}.tar.bz2"
@@ -31,17 +31,13 @@ SLOT="0"
 
 IUSE="+X +server debug"
 
-RDEPEND="|| (
-		(
-			x11-libs/qt-core:4
-			server? (
-				x11-libs/qt-sql:4
-				x11-libs/qt-script:4
-			)
-			X? ( x11-libs/qt-gui:4 )
+RDEPEND="x11-libs/qt-core:4
+		server? (
+			x11-libs/qt-sql:4
+			x11-libs/qt-script:4
 		)
-		=x11-libs/qt-4.3*:4
-	)"
+		X? ( x11-libs/qt-gui:4 )"
+
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.7"
 
@@ -85,4 +81,16 @@ src_install() {
 		# avoid the connected/ directory, get only the ${size}x${size}
 		doins -r "${S}"/src/icons/quassel/*x*
 	fi
+
+	if use server; then
+		newinitd "${FILESDIR}"/quasselcore.init quasselcore
+		newconfd "${FILESDIR}"/quasselcore.conf quasselcore
+	fi
+}
+
+pkg_postinst() {
+	if use server; then
+		ewarn "In order to use the quassel init script you must set the"
+		ewarn "QUASSEL_USER variable in /etc/conf.d/quasselcore to your username."
+	fi
 }