Revision bump. Update initscripts. Fix live correctly. Proxycommit for billie

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

6 files changed, 128 insertions, 70 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index f34ed9934092..421906c845d1 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.44 2009/02/19 11:48:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.45 2009/02/20 20:02:08 scarabeus Exp $
+
+*quassel-0.4.0-r1 (20 Feb 2009)
+
+  20 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/quasselcore-2.conf, +files/quasselcore-2.init,
+  -quassel-0.4.0.ebuild, +quassel-0.4.0-r1.ebuild, quassel-9999.ebuild:
+  Revision bump. Update initscripts. Fix live correctly. Proxycommit for
+  billie.
 
 *quassel-0.4.0 (19 Feb 2009)
 
diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index 63548c7fe9a8..2386f1de6409 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -1,3 +1,5 @@
+AUX quasselcore-2.conf 548 RMD160 afc8ee2d5bc8449c51afd46699e7b9796ff77b1f SHA1 e9492c10864df233edda84411f7cf15e1f7f3573 SHA256 973bff9a4dac8e25b6a7b8dc8355f763c65e31f070b1fc5904f6325045ad3cb5
+AUX quasselcore-2.init 1627 RMD160 fc0885dc6a2295ad1dcb49aefc1adfd184388fb2 SHA1 2629a3019913b1c685406fc88ead655e10bed943 SHA256 318e85a896fc2672651fa270dd98bfb664c0cb20cc8ae34c18363dbef36d820b
 AUX quasselcore.conf 386 RMD160 01ce00964866419ea2b11c4f23d09a6542d32ccd SHA1 13f2d8da2ec68c6c8db019900abfa2334c1d0652 SHA256 b0e8873ac4a9a1ab78f8b96141e2c0159eeaf7e8ad0c7d8d3e53320fafcef1da
 AUX quasselcore.init 1521 RMD160 f43a3c29f97cc44a6348d9ebf378d0531342cb05 SHA1 a7acf78a66a048a6cdc4cac54dae1f7e7d3d5b3f SHA256 eae2f4d8fb0a13f1bd449ea21d0493b9dcbed1df3417039ebf7b8c999f9a4a51
 DIST quassel-0.3.0.3.tar.bz2 1971668 RMD160 d8b43242fae90b60e1c89246e352e0aa7b5bb6c6 SHA1 36178a1ee155e4514dfc4373b057c5e31f84927f SHA256 78d164d85ce695c3c3cacc2197d95bf8aeca3e6af3e7f450b6960e44ab632049
@@ -6,7 +8,7 @@ DIST quassel-0.4.0.tar.bz2 3012967 RMD160 1529bdde49f05b2f9da0bcef6c4605da28074b
 EBUILD quassel-0.3.0.3.ebuild 3985 RMD160 f2a5fe715e7796d61e0d7d90363d2a7bc927c6cb SHA1 7c896d5b375f506e43b692335335103d535790d5 SHA256 7d9463a9382584bba994b6bed0ae5a9d1913564913f3821627d17d6bb5ebd3a8
 EBUILD quassel-0.3.1-r2.ebuild 3962 RMD160 0e1095c1324a79c70dbcf2753355329d60a8058f SHA1 fc4c675071abeb2df4d46f9cdd8055cd6fa8a245 SHA256 8bd02f36bcf91037d39c50ce279c4b02f82a7e290bf9ba1ffe88d43542dc4156
 EBUILD quassel-0.3.1-r4.ebuild 3630 RMD160 0982437d5517b566029d596ca267325fd9f733cb SHA1 3833991fe5f535f35e5d7cb2325dbde9531b431c SHA256 8969fa3f74f1e65eb014989c123e4c1cc9691f019c5654efea4dfb1c04891378
-EBUILD quassel-0.4.0.ebuild 4157 RMD160 c08447839dd0733f983d6e22eb3660f0db55137b SHA1 b0829f87a39e4ce0b3b175c3b6da8a651cf08af9 SHA256 e1d129a6ab1e5c2b3800d7246a3078bdfaa0a9c105fee040acff05709a5fc719
-EBUILD quassel-9999.ebuild 4176 RMD160 277c9002aa1477a1a676193c5534fcf3612d44da SHA1 490a499dae72bfbf01d943e18fca50d7bfb8b75b SHA256 bf765a7ae52872a652ecabf1fe8c40e1ee07c11f58e6bcb7c87fb080675c309a
-MISC ChangeLog 8523 RMD160 0d0d5f433978c5d9b9c097a19e2d184ac5d40ba9 SHA1 4154a4a3547e16e8253a2c2f0b4ce89394ead8b8 SHA256 5d2d5d68c3a02fa366d7113710af6bdfa8b22602a1ab8c758c845c8ff301f697
+EBUILD quassel-0.4.0-r1.ebuild 3546 RMD160 eb1ee76405da0ea375faf400f66c17096d22d837 SHA1 2895e92d4560200abbf14fee6d0505a91d2ae448 SHA256 59e7c6b11a29812031b23b12df6aefa3c77997e0610ad1599bfc8a95ce714e12
+EBUILD quassel-9999.ebuild 3562 RMD160 c09953b81e375e54010752b65d0b38666e1698d9 SHA1 a09760925ecd4b10c10a735e0e20423ac33848d5 SHA256 cfad9f3e6def932395932e5e1133678009d704c0f1ba630ef417e4fc1aa0dbb8
+MISC ChangeLog 8820 RMD160 9a265d36842dad5951e48515c4bc4751fc213cb0 SHA1 6d78dac0313c9bd82132900645d2cdd0c0f33ca2 SHA256 3ca57e6912fb6edf81a1f3e6441f77ef3999c01666182761a064024ac9693d6e
 MISC metadata.xml 1569 RMD160 13153e6baac0747a9c4b7606a12121c7e3aac326 SHA1 562f75d3fb7734fb0f0cb2566216bc552e0ece85 SHA256 e6be6532135d9a65f789159ff71dfe987dc8e7ea710e2668dbf741738b15f24c
diff --git a/net-irc/quassel/files/quasselcore-2.conf b/net-irc/quassel/files/quasselcore-2.conf
new file mode 100644
index 000000000000..a824606eb112
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore-2.conf
@@ -0,0 +1,18 @@
+# /etc/conf.d/quasselcore
+
+# The user owning the quasselcore daemon.
+QUASSEL_USER=""
+
+# Loglevel Debug|Info|Warning|Error. Default is: Info
+# The logfile is located at /var/log/quassel.log.
+LOGLEVEL="Info"
+
+# The address(es) quasselcore will listen on. Default is: 0.0.0.0
+LISTEN="0.0.0.0"
+
+# The port quasselcore will listen at. Default is: 4242
+PORT="4242"
+
+# Specify the directory holding configuration files, the SQlite database
+# and the SSL Cert. Default is ~/.config/quassel-irc.org
+CONFIGDIR="/home/${QUASSEL_USER}/.config/quassel-irc.org"
diff --git a/net-irc/quassel/files/quasselcore-2.init b/net-irc/quassel/files/quasselcore-2.init
new file mode 100644
index 000000000000..a58197dfbb0b
--- /dev/null
+++ b/net-irc/quassel/files/quasselcore-2.init
@@ -0,0 +1,48 @@
+#!/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-2.init,v 1.1 2009/02/20 20:02:08 scarabeus 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"
+	local LOGFILE="/var/log/quassel.log"
+	if [ ! -e ${LOGFILE} ] ; then
+		touch ${LOGFILE} && chown ${QUASSEL_USER} ${LOGFILE}
+	fi
+
+	if [[ -n "${RC_UNAME}" ]]; 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 -- --logfile=${LOGFILE} \
+		--loglevel=${LOGLEVEL:-"Info"} --listen=${LISTEN:-"0.0.0.0"} --port=${PORT:-"4242"} \
+		--configdir=${CONFIGDIR:-"/home/${QUASSEL_USER}/.config/quassel-irc.org"}
+	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 -- --logfile=${LOGFILE} --loglevel=${LOGLEVEL:-"Info"} \
+		--listen=${LISTEN:-"0.0.0.0"} --port=${PORT:-"4242"} \
+		--configdir=${CONFIGDIR:-"/home/${QUASSEL_USER}/.config/quassel-irc.org"}
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Quassel Core"
+	start-stop-daemon --stop --pidfile /var/run/quassel.pid --exec /usr/bin/quasselcore
+	eend $?
+}
diff --git a/net-irc/quassel/quassel-0.4.0.ebuild b/net-irc/quassel/quassel-0.4.0-r1.ebuild
index 184336c54ed1..f3bbfef1a115 100644
--- a/net-irc/quassel/quassel-0.4.0.ebuild
+++ b/net-irc/quassel/quassel-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0.ebuild,v 1.1 2009/02/19 11:48:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.4.0-r1.ebuild,v 1.1 2009/02/20 20:02:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="dbus debug kde monolithic +oxygen phonon +server +ssl webkit +X"
 
-LANGS="cs da de fr nb_NO ru tr"
+LANGS="cs da de fr hu nb_NO ru sl tr"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
@@ -62,44 +62,34 @@ pkg_setup() {
 }
 
 src_configure() {
-# Comment this out and invoke _common_configure_code and cmake manually until cmake-utils.eclass
-# supports space separated strings as arguments for cmake options or quassel changes the
-# separator. Until now multiple languages are not passed to -DLINGUAS and only the first
-# language is considered.
-	local mycmakeargs="$(cmake-utils_use_want server CORE)
+	local MY_LANGUAGES=""
+	for i in ${LINGUAS}; do
+		MY_LANGUAGES="${i},${MY_LANGUAGES}"
+	done
+
+	local mycmakeargs="
 		$(cmake-utils_use_want X QTCLIENT)
+		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want monolithic MONO)
 		$(cmake-utils_use_with webkit WEBKIT)
-		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with phonon PHONON)
 		$(cmake-utils_use_with kde KDE)
-		$(cmake-utils_use_with oxygen OXYGEN)
+		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
-		-DEMBED_DATA=OFF"
-
-	if use kde ; then
-		# We don't use our own phonon backend, so don't enable it; also use system icon themes
-		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0"
-	else
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)"
-	fi
-
-	_common_configure_code
-
-	mkdir -p "${WORKDIR}"/${PN}_build
-	pushd "${WORKDIR}"/${PN}_build > /dev/null
+		$(cmake-utils_use_with oxygen OXYGEN)
+		-DEMBED_DATA=OFF
+		-DLINGUAS=${MY_LANGUAGES}
+		"
 
-	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
-		${mycmakeargs} \
-		-DLINGUAS="${LINGUAS}" \
-		"${S}" || die "Cmake failed"
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
 
 	if use server ; then
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
+		newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed"
+		newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed"
 
 		insinto /usr/share/doc/${PF}
 		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
@@ -118,14 +108,15 @@ pkg_postinst() {
 		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."
+		elog "http://bugs.quassel-irc.org/wiki/quassel-irc/Manage_core_users provides"
+		elog "some information on using the script."
+		elog "To be sure nothing bad will happen you need to stop the quasselcore"
+		elog "before adding more users."
 	fi
 
 	if ( use server || use monolithic ) && 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"
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
 	fi
 }
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 8f024065e215..a3871922b449 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.18 2009/02/19 11:48:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.19 2009/02/20 20:02:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ KEYWORDS=""
 SLOT="0"
 IUSE="dbus debug kde monolithic +oxygen phonon +server +ssl webkit +X"
 
-LANGS="cs da de fr nb_NO ru tr"
+LANGS="cs da de fr hu nb_NO ru sl tr"
 for l in ${LANGS}; do
 	IUSE="${IUSE} linguas_${l}"
 done
@@ -64,44 +64,34 @@ pkg_setup() {
 }
 
 src_configure() {
-# Comment this out and invoke _common_configure_code and cmake manually until cmake-utils.eclass
-# supports space separated strings as arguments for cmake options or quassel changes the
-# separator. Until now multiple languages are not passed to -DLINGUAS and only the first
-# language is considered.
-	local mycmakeargs="$(cmake-utils_use_want server CORE)
+	local MY_LANGUAGES=""
+	for i in ${LINGUAS}; do
+		MY_LANGUAGES="${i},${MY_LANGUAGES}"
+	done
+
+	local mycmakeargs="
 		$(cmake-utils_use_want X QTCLIENT)
+		$(cmake-utils_use_want server CORE)
 		$(cmake-utils_use_want monolithic MONO)
 		$(cmake-utils_use_with webkit WEBKIT)
-		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use_with phonon PHONON)
 		$(cmake-utils_use_with kde KDE)
-		$(cmake-utils_use_with oxygen OXYGEN)
+		$(cmake-utils_use_with dbus DBUS)
 		$(cmake-utils_use_with ssl OPENSSL)
-		-DEMBED_DATA=OFF"
-
-	if use kde ; then
-		# We don't use our own phonon backend, so don't enable it; also use system icon themes
-		mycmakeargs="${mycmakeargs} -DWITH_PHONON=0"
-	else
-		mycmakeargs="${mycmakeargs} $(cmake-utils_use_with phonon PHONON)"
-	fi
-
-	_common_configure_code
-
-	mkdir -p "${WORKDIR}"/${PN}_build
-	pushd "${WORKDIR}"/${PN}_build > /dev/null
+		$(cmake-utils_use_with oxygen OXYGEN)
+		-DEMBED_DATA=OFF
+		-DLINGUAS=${MY_LANGUAGES}
+		"
 
-	cmake -C "${TMPDIR}/gentoo_common_config.cmake" \
-		${mycmakeargs} \
-		-DLINGUAS="${LINGUAS}" \
-		"${S}" || die "Cmake failed"
+	cmake-utils_src_configure
 }
 
 src_install() {
 	cmake-utils_src_install
 
 	if use server ; then
-		newinitd "${FILESDIR}"/quasselcore.init quasselcore || die "newinitd failed"
-		newconfd "${FILESDIR}"/quasselcore.conf quasselcore || die "newconfd failed"
+		newinitd "${FILESDIR}"/quasselcore-2.init quasselcore || die "newinitd failed"
+		newconfd "${FILESDIR}"/quasselcore-2.conf quasselcore || die "newconfd failed"
 
 		insinto /usr/share/doc/${PF}
 		doins "${S}"/scripts/manageusers.py || die "installing manageusers.py failed"
@@ -120,14 +110,15 @@ pkg_postinst() {
 		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."
+		elog "http://bugs.quassel-irc.org/wiki/quassel-irc/Manage_core_users provides"
+		elog "some information on using the script."
+		elog "To be sure nothing bad will happen you need to stop the quasselcore"
+		elog "before adding more users."
 	fi
 
 	if ( use server || use monolithic ) && 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"
+		elog "Information on how to enable SSL support for client/core connections"
+		elog "is available at http://bugs.quassel-irc.org/wiki/quassel-irc."
 	fi
 }