summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-02-20 20:02:08 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-02-20 20:02:08 +0000
commitafc7acf60f50dddcd7f483f378a60775e8ca7677 (patch)
tree9d4fdd0a7619729c4b719e9195c443adb54615a8 /net-irc/quassel
parentBump sys-cluster/openmpi-1.2.9 (diff)
downloadgentoo-2-afc7acf60f50dddcd7f483f378a60775e8ca7677.tar.gz
gentoo-2-afc7acf60f50dddcd7f483f378a60775e8ca7677.tar.bz2
gentoo-2-afc7acf60f50dddcd7f483f378a60775e8ca7677.zip
Revision bump. Update initscripts. Fix live correctly. Proxycommit for billie
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-irc/quassel')
-rw-r--r--net-irc/quassel/ChangeLog10
-rw-r--r--net-irc/quassel/files/quasselcore-2.conf18
-rw-r--r--net-irc/quassel/files/quasselcore-2.init48
-rw-r--r--net-irc/quassel/quassel-0.4.0-r1.ebuild (renamed from net-irc/quassel/quassel-0.4.0.ebuild)57
-rw-r--r--net-irc/quassel/quassel-9999.ebuild57
5 files changed, 123 insertions, 67 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/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
}