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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

8 files changed, 102 insertions, 26 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/Manifest b/net-irc/quassel/Manifest
index 4500525d5988..d52d2566bec6 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX quasselcore.conf 590 RMD160 8eddc833fdefb7cb0e1ae90bc33bd1c96954e0cd SHA1 2b61c615952ce4a49d5cd118a03a65f10aac4303 SHA256 eee3a94e5abdfd09a13af8583182409049539d96b26a7c8817674d6d2115f239
+AUX quasselcore.init 634 RMD160 3081d3b4bf0bcb7b49595a2d057e71838040289d SHA1 f6839a5b600d8cd841977618710e9f0ea94b1d65 SHA256 1a29cd644d668d70ff42b489a5c19182df8c57f24dbc91b65babd122c81a958d
 DIST quassel-0.2.0-beta1.tar.bz2 967029 RMD160 8ae5af27714b60f38b123f6b0bbef9da4c8b1ffe SHA1 36fe1f1352f79f77d824d076add4e9e24c49ba75 SHA256 b57e9736e40f43233902b8903ed9681fda2deadf9a3e31a75d3a7726b0c784ef
 DIST quassel-0.2.0-rc1.tar.bz2 2135106 RMD160 8040ab1fe20b501cee2211f678f3fbf07aaadabb SHA1 eabb0f9a265ae4d0e26f855826a422bc293ae54f SHA256 bb8a7d982b2596c18a3bdbbf7b6ef295588d79f259198b5dbacffebfc5009ccd
 EBUILD quassel-0.2.0_beta1.ebuild 2224 RMD160 3e8d7db7027846e11d6d222d6613c818f9d82609 SHA1 413babd729891410056137553f317870665f797e SHA256 e303f76f534d0cd0712457b295563311710172435c9262c1f7b1c6de60796fe2
-EBUILD quassel-0.2.0_rc1.ebuild 2140 RMD160 750155da7986e3d9dc7ac20c4b1ff8f9c40ab88e SHA1 ddefc305c99570cc02eb1898d99ede0fd70fb8c6 SHA256 47ec18f7e880bec8e5897c95737089e88e8ffea8428a3f63f79babe970ad2a13
-EBUILD quassel-0.2.9999.ebuild 2079 RMD160 1e4694b842a15878f99c1135d9db9a575635f1fa SHA1 c64a1a0da1ac63e3ef263ad19abd645db1659452 SHA256 4e7f5d0520658058230df32f6afd6cb38cc00eb4e5b81f41d1faf23ea3c75a35
-EBUILD quassel-9999-r1.ebuild 2078 RMD160 ef1dfe594805fc77c674c5172f9723c04c7790cf SHA1 52cec800c99659b63640daf8e74320988a55515c SHA256 873df935daa27571d99a757038869fae5c71543a7f21b411c2055e687e310eb2
-MISC ChangeLog 4199 RMD160 98de5c4eb903345b86f3391c596f3617e6ccd53b SHA1 2e8c994cefa58df68f1ff9d31364292f45f637dc SHA256 b8d7511ad6b1b74905f685caf50146b2f6fc832d6a2b8f14f818db1c7806259f
-MISC metadata.xml 774 RMD160 010aec105a64c3df2588c730d486141c8a012fde SHA1 4ffb676c8c4fb09165ddb5b4290fc45cc669ceff SHA256 3dc9c83a72739921a5c7197db9f634cfe84dfd49f12fd4804252e3c583ecf799
+EBUILD quassel-0.2.0_rc1.ebuild 2459 RMD160 9516b3e2a12a73b16c2428bec36c2f87c62fb18f SHA1 25a6ea37c6de9d46c3432c4de5abc405646e5f8f SHA256 a656a77d91d2b9f8a4c1106bf11f5d1aa7e8d8f218e211384b14cd0674c00dd4
+EBUILD quassel-0.2.9999.ebuild 2398 RMD160 61592b344d233cc20305793ffec91e1674537b65 SHA1 eb8e9fda05c4a50f3053007d481fa06630cd76d7 SHA256 0c42935b85ce5a6eac9ad4bf8ea2d9522f53dc785611df1d5289ffdc5bd64c3f
+EBUILD quassel-9999-r1.ebuild 2352 RMD160 524b3a26c0e15cf07475187c82eede0ab6976199 SHA1 407e4d7605f6b42e4cf238098b291106940824eb SHA256 2b847d4c288d510de8a46ebf654276be905cff007b79bb007602b95383e74fad
+MISC ChangeLog 4473 RMD160 a8599f4ae5236b2e9352b4492acf849376267161 SHA1 4c904b43e12bf522dbd73d4405868279eb7ceae7 SHA256 ac65ba3b64d24e2c93df4e4a56133eba793d2f6deb06cbf2f915408d4c9587de
+MISC metadata.xml 770 RMD160 5a905a2b777f958a229b50a169b357978fa178a8 SHA1 10a1c0af8b6d105bcb28779d265cd3964519a92e SHA256 5de31da7c6c876b311907554328bc6a3cd61ac4d2b35b1d700dcd02d07530916
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhsBq8ACgkQAiZjviIA2Xg+xgCfdDCDXxWuNP+VsbPCja2w0s2S
-oE8An3XWyhc5jNnM9gDCg7QyCyTmZnYY
-=RpxV
+iEYEARECAAYFAkiz8K0ACgkQz974XjDVpbletQCgpK5FDS9ZXAL6gQDSNRErGLgS
+4QgAn0BoYfhRN48eo8YMTwVXnf3y5lrv
+=8njD
 -----END PGP SIGNATURE-----
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
 }