Import some init script fixes and ebuild improvements from Daniel Pielmeier. Drop old as well

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

7 files changed, 125 insertions, 232 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index efb90be79085..927f37fa28dc 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,15 @@
 # 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.29 2008/09/03 20:43:21 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.30 2008/09/28 19:12:20 jokey Exp $
+
+*quassel-0.3.0.1-r1 (28 Sep 2008)
+
+  28 Sep 2008; Markus Ullmann <jokey@gentoo.org> files/quasselcore.conf,
+  files/quasselcore.init, -quassel-0.2.0_rc1-r1.ebuild,
+  -quassel-0.3.0-r1.ebuild, -quassel-0.3.0.1.ebuild,
+  +quassel-0.3.0.1-r1.ebuild, quassel-9999.ebuild:
+  Import some init script fixes and ebuild improvements from Daniel
+  Pielmeier. Drop old as well
 
 *quassel-0.3.0.1 (03 Sep 2008)
 
diff --git a/net-irc/quassel/files/quasselcore.conf b/net-irc/quassel/files/quasselcore.conf
index 8ac3f1095c69..f5f2d376edb5 100644
--- a/net-irc/quassel/files/quasselcore.conf
+++ b/net-irc/quassel/files/quasselcore.conf
@@ -1,14 +1,14 @@
 # /etc/conf.d/quasselcore
 
+# The user owning the quasselcore daemon
 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
+# Loglevel Debug|Info|Warning|Error. Default is: Info
+# The logfile is located at /var/log/quassel.log.
+LOGLEVEL="Info"
 
-#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.
+# The port quasselcore will listen at. Default is: 4242
+PORT="4242"
+
+# The directory holding datafiles like the Sqlite DB and the SSL Cert
+DATADIR="/home/${QUASSEL_USER}/.quassel"
diff --git a/net-irc/quassel/files/quasselcore.init b/net-irc/quassel/files/quasselcore.init
index 7edb80fb8b89..fcf661bf6bfa 100644
--- a/net-irc/quassel/files/quasselcore.init
+++ b/net-irc/quassel/files/quasselcore.init
@@ -1,23 +1,41 @@
 #!/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.2 2008/08/30 19:02:54 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/files/quasselcore.init,v 1.3 2008/09/28 19:12:21 jokey Exp $
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if [ -z "${QUASSEL_USER}" ] ; then
+		eerror "Did you read the elog messages? You need to define the"
+		eerror "QUASSEL_USER variable in /etc/conf.d/quasselcore first."
+		return 1
+	fi
+}
+
 start() {
+	checkconfig || return 1
+
 	ebegin "Starting Quassel Core"
-	if [ -x /etc/init.d/root ]; then
+	local LOGFILE="/var/log/quassel.log"
+	if [ ! -e ${LOGFILE} ] ; then
+		touch ${LOGFILE} && chown ${QUASSEL_USER} ${LOGFILE}
+	fi
+
+	if [ -x /etc/init.d/root ] ; then
 		# running on baselayout-2/openrc
 		start-stop-daemon --start --user ${QUASSEL_USER} --background --make-pidfile \
-		--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+		--pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore -- --logfile=${LOGFILE} \
+		--loglevel=${LOGLEVEL:-"Info"} --port=${PORT:-"4242"} \
+		--datadir=${DATADIR:-"/home/${QUASSEL_USER}/.quassel"}
 	else
 		# running on baselayout-1
 		start-stop-daemon --start --chuid ${QUASSEL_USER} --background --make-pidfile \
 		--pidfile /var/run/quassel.pid --env HOME="/home/${QUASSEL_USER}" \
-		--exec /usr/bin/quasselcore -- ${QUASSEL_OPTS}
+		--exec /usr/bin/quasselcore -- --logfile=${LOGFILE} --loglevel=${LOGLEVEL:-"Info"} \
+		--port=${PORT:-"4242"} --datadir=${DATADIR:-"/home/${QUASSEL_USER}/.quassel"}
 	fi
 	eend $?
 }
diff --git a/net-irc/quassel/quassel-0.2.0_rc1-r1.ebuild b/net-irc/quassel/quassel-0.2.0_rc1-r1.ebuild
deleted file mode 100644
index 96a490f04bbd..000000000000
--- a/net-irc/quassel/quassel-0.2.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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-r1.ebuild,v 1.1 2008/08/30 19:02:53 jokey Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-if [[ ${PV} == *9999 ]]; then
-	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"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-
-LICENSE="GPL-3"
-
-KEYWORDS="~amd64 ~x86"
-
-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 )
-		)
-		=x11-libs/qt-4.3*:4
-	)"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-DOCS="ChangeLog README README.Qtopia"
-
-pkg_setup() {
-	if ! use server && ! use X; then
-		eerror "You have to build one or both of quassel client or server."
-		die "Both server and X USE flags unset."
-	fi
-
-	qt44=$(has_version x11-libs/qt-sql && echo yes || echo no)
-	if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then
-		eerror "Quassel require Qt 4 built with SQLite support"
-		if [[ ${qt44} == "yes" ]]; then
-			eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-			die "Missing sqlite support in x11-libs/qt-sql:4"
-		else
-			eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled."
-			die "Missing sqlite3 support in x11-libs/qt:4"
-		fi
-	fi
-}
-
-src_compile() {
-	local mycmakeargs="
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want X QTCLIENT)
-		-DWANT_MONO=OFF
-		"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Only install the icons if the X client was installed
-	if use X; then
-		local size
-		for size in 16 24 32 48 64 96 128 256 512; do
-			insinto /usr/share/icons/hicolor/${size}x${size}
-			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.3.0-r1.ebuild b/net-irc/quassel/quassel-0.3.0-r1.ebuild
deleted file mode 100644
index 3b80441926f0..000000000000
--- a/net-irc/quassel/quassel-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.3.0-r1.ebuild,v 1.1 2008/08/30 19:02:53 jokey Exp $
-
-EAPI=1
-
-inherit cmake-utils eutils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Core/client IRC client."
-HOMEPAGE="http://quassel-irc.org/"
-SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~sparc ~x86"
-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 )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-DOCS="ChangeLog README README.Qtopia"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! use server && ! use X; then
-		eerror "You have to build one or both of quassel client or server."
-		die "Both server and X USE flags unset."
-	fi
-
-	qt44=$(has_version x11-libs/qt-sql && echo yes || echo no)
-	if use server && ! built_with_use $([[ ${qt44} == "yes" ]] && echo "x11-libs/qt-sql sqlite" || echo "x11-libs/qt:4 sqlite3"); then
-		eerror "Quassel require Qt 4 built with SQLite support"
-		if [[ ${qt44} == "yes" ]]; then
-			eerror "Please rebuild x11-libs/qt-sql:4 with sqlite USE flag enabled."
-			die "Missing sqlite support in x11-libs/qt-sql:4"
-		else
-			eerror "Please rebuild x11-libs/qt:4 with sqlite3 USE flag enabled."
-			die "Missing sqlite3 support in x11-libs/qt:4"
-		fi
-	fi
-}
-
-src_compile() {
-	local mycmakeargs="
-		$(cmake-utils_use_want server CORE)
-		$(cmake-utils_use_want X QTCLIENT)
-		-DWANT_MONO=OFF
-		"
-
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Only install the icons if the X client was installed
-	if use X; then
-		insinto /usr/share/icons/hicolor
-		# 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-0.3.0.1.ebuild b/net-irc/quassel/quassel-0.3.0.1-r1.ebuild
index c0467a80e7ae..987464f3a6a3 100644
--- a/net-irc/quassel/quassel-0.3.0.1.ebuild
+++ b/net-irc/quassel/quassel-0.3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.1.ebuild,v 1.1 2008/09/03 20:43:21 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.3.0.1-r1.ebuild,v 1.1 2008/09/28 19:12:21 jokey Exp $
 
 EAPI=1
 
@@ -17,6 +17,11 @@ KEYWORDS="~amd64 ~sparc ~x86"
 SLOT="0"
 IUSE="+dbus debug +server +ssl +X"
 
+LANGS="nb_NO da de fr"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
 RDEPEND="x11-libs/qt-core:4
 		server? (
 			x11-libs/qt-sql:4
@@ -28,12 +33,12 @@ RDEPEND="x11-libs/qt-core:4
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.7"
 
-DOCS="ChangeLog README README.Qtopia"
+DOCS="AUTHORS ChangeLog README README.Qtopia"
 
 S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
-	if ! use server && ! use X; then
+	if ! use server && ! use X ; then
 		eerror "You have to build one or both of quassel client or server."
 		die "Both server and X USE flags unset."
 	fi
@@ -50,11 +55,19 @@ pkg_setup() {
 }
 
 src_compile() {
+	local MY_LANGUAGES=""
+	for ling in ${LINGUAS}; do
+		if has $ling ${LANGS}; then
+			MY_LANGUAGES="${ling} ${MY_LANGUAGES}"
+		fi
+	done
+
 	local mycmakeargs="
 		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want X QTCLIENT)
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
+		-DLINGUAS="${MY_LANGUAGES}"
 		-DWANT_MONO=OFF"
 
 	cmake-utils_src_compile
@@ -64,21 +77,41 @@ src_install() {
 	cmake-utils_src_install
 
 	# Only install the icons if the X client was installed
-	if use X; then
+	if use X ; then
 		insinto /usr/share/icons/hicolor
 		# avoid the connected/ directory, get only the ${size}x${size}
-		doins -r "${S}"/src/icons/quassel/*x* || die "installing icons failed"
+		doins -r "${S}"/src/icons/quassel/*x* || die "installing quassel icons failed"
 	fi
 
-	if use server; then
+	if use server ; then
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
+
+		insinto /usr/share/doc/${PF}
+		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
 	fi
 }
 
 pkg_postinst() {
-	if use server; then
+	if use server ; then
+		ewarn
 		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."
+		ewarn "Note: This is the user who runs the quasselcore and is independent"
+		ewarn "from the users you set up in the quasselclient."
+		elog
+		elog "Adding more than one user or changing username/password is not"
+		elog "possible via the quasselclient yet. If you need to do these things"
+		elog "you have to use the manageusers.py script, which has been installed in"
+		elog "/usr/share/doc/${PF}".
+		elog "Please make sure that the quasselcore is stopped before adding more users."
+	fi
+
+	if use server && use ssl ; then
+		elog
+		elog "To enable SSL support for client/core connections the quasselcore needs"
+		elog "a PEM certificate which needs to be stored in ~/.quassel/quasselCert.pem."
+		elog "To create the certificate use the following command:"
+		elog "openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.quassel/quasselCert.pem -out ~/.quassel/quasselCert.pem"
 	fi
 }
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index dcd00e32ce9e..aad895af55ab 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,24 +1,13 @@
 # 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.ebuild,v 1.8 2008/09/01 18:51:57 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.9 2008/09/28 19:12:20 jokey Exp $
 
 EAPI=1
 
-inherit cmake-utils eutils
+inherit cmake-utils eutils git
 
-if [[ ${PV} == *9999 ]]; then
-	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"
-	S=${WORKDIR}/${MY_P}
-fi
+EGIT_REPO_URI="git://git.quassel-irc.org/quassel.git"
+EGIT_BRANCH="master"
 
 DESCRIPTION="Core/client IRC client."
 HOMEPAGE="http://quassel-irc.org/"
@@ -28,6 +17,11 @@ KEYWORDS=""
 SLOT="0"
 IUSE="+dbus debug +server +ssl +X"
 
+LANGS="nb_NO da de fr"
+for l in ${LANGS}; do
+	IUSE="${IUSE} linguas_${l}"
+done
+
 RDEPEND="x11-libs/qt-core:4
 		server? (
 			x11-libs/qt-sql:4
@@ -37,12 +31,12 @@ RDEPEND="x11-libs/qt-core:4
 		dbus? ( x11-libs/qt-dbus )
 		ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
+	>=dev-util/cmake-2.6"
 
-DOCS="ChangeLog README README.Qtopia"
+DOCS="AUTHORS ChangeLog README"
 
 pkg_setup() {
-	if ! use server && ! use X; then
+	if ! use server && ! use X ; then
 		eerror "You have to build one or both of quassel client or server."
 		die "Both server and X USE flags unset."
 	fi
@@ -59,11 +53,21 @@ pkg_setup() {
 }
 
 src_compile() {
+	local MY_LANGUAGES=""
+	for ling in ${LINGUAS}; do
+		if has $ling ${LANGS}; then
+			MY_LANGUAGES="${ling} ${MY_LANGUAGES}"
+		fi
+	done
+
 	local mycmakeargs="
 		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want X QTCLIENT)
 		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
+		-DLINGUAS="${MY_LANGUAGES}"
+		-DOXYGEN_ICONS=Builtin
+		-DQUASSEL_ICONS=Builtin
 		-DWANT_MONO=OFF"
 
 	cmake-utils_src_compile
@@ -72,22 +76,35 @@ src_compile() {
 src_install() {
 	cmake-utils_src_install
 
-	# Only install the icons if the X client was installed
-	if use X; then
-		insinto /usr/share/icons/hicolor
-		# avoid the connected/ directory, get only the ${size}x${size}
-		doins -r "${S}"/src/icons/quassel/*x* || die "installing icons failed"
-	fi
-
-	if use server; then
+	if use server ; then
 		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
 		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
+
+		insinto /usr/share/doc/${PF}
+		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
 	fi
 }
 
 pkg_postinst() {
-	if use server; then
+	if use server ; then
+		ewarn
 		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."
+		ewarn "Note: This is the user who runs the quasselcore and is independent"
+		ewarn "from the users you set up in the quasselclient."
+		elog
+		elog "Adding more than one user or changing username/password is not"
+		elog "possible via the quasselclient yet. If you need to do these things"
+		elog "you have to use the manageusers.py script, which has been installed in"
+		elog "/usr/share/doc/${PF}".
+		elog "Please make sure that the quasselcore is stopped before adding more users."
+	fi
+
+	if use server && use ssl ; then
+		elog
+		elog "To enable SSL support for client/core connections the quasselcore needs"
+		elog "a PEM certificate which needs to be stored in ~/.quassel/quasselCert.pem."
+		elog "To create the certificate use the following command:"
+		elog "openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout ~/.quassel/quasselCert.pem -out ~/.quassel/quasselCert.pem"
 	fi
 }