--- quassel-9999-r1.ebuild.old	2008-08-05 00:11:43.000000000 +0200
+++ quassel-9999-r1.ebuild	2008-08-06 22:15:46.000000000 +0200
@@ -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: $
 
 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 @@
 
 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 @@
 		# 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
 }