Add support for syslog switching and add oident elog information.

(Portage version: 2.2.0_alpha96/cvs/Linux x86_64)

3 files changed, 33 insertions, 11 deletions

diff --git a/net-irc/quassel/ChangeLog b/net-irc/quassel/ChangeLog
index bdc2f74e23f0..b1f1facf641e 100644
--- a/net-irc/quassel/ChangeLog
+++ b/net-irc/quassel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/quassel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.137 2012/03/21 03:04:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/ChangeLog,v 1.138 2012/03/31 11:20:35 scarabeus Exp $
+
+  31 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> quassel-0.8.0.ebuild,
+  quassel-9999.ebuild:
+  Add support for syslog switching and add oident elog information.
 
 *quassel-0.8.0 (21 Mar 2012)
 
diff --git a/net-irc/quassel/quassel-0.8.0.ebuild b/net-irc/quassel/quassel-0.8.0.ebuild
index c9858463f2fe..e14930e98acb 100644
--- a/net-irc/quassel/quassel-0.8.0.ebuild
+++ b/net-irc/quassel/quassel-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.8.0.ebuild,v 1.1 2012/03/21 03:04:07 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-0.8.0.ebuild,v 1.2 2012/03/31 11:20:35 scarabeus Exp $
 
 EAPI=4
 
@@ -20,16 +20,17 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~sparc-solaris"
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
 
 SERVER_RDEPEND="
+	>=x11-libs/qt-script-${QT_MINIMAL}:4
 	crypt? (
 		app-crypt/qca:2
 		app-crypt/qca-ossl
 	)
 	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
 	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
-	>=x11-libs/qt-script-${QT_MINIMAL}:4
+	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
@@ -69,6 +70,7 @@ REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
+	syslog? ( || ( server monolithic ) )
 	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	dbus? ( || ( X monolithic ) )
@@ -97,6 +99,7 @@ src_configure() {
 		$(cmake-utils_use_with kde)
 		$(cmake-utils_use_with dbus)
 		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with syslog)
 		$(cmake-utils_use_with !kde OXYGEN)
 		$(cmake-utils_use_with crypt)
 		"-DEMBED_DATA=OFF"
@@ -109,7 +112,7 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server ; then
-		# bug 346255
+		# needs PAX marking wrt bug#346255
 		pax-mark m "${ED}/usr/bin/quasselcore" || die
 
 		# prepare folders in /var/
@@ -137,6 +140,11 @@ pkg_postinst() {
 		einfo "	emerge --config =${CATEGORY}/${PF}"
 	fi
 
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
 	# temporary info mesage
 	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
 		echo
@@ -166,5 +174,4 @@ pkg_config() {
 			einfo "Remove it if you want to create new one."
 		fi
 	fi
-
 }
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index 4d7a3f580201..5bf07a88cc6b 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.61 2011/08/18 12:51:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/quassel/quassel-9999.ebuild,v 1.62 2012/03/31 11:20:35 scarabeus Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ EGIT_BRANCH="master"
 QT_MINIMAL="4.6.0"
 KDE_MINIMAL="4.4"
 
-inherit cmake-utils eutils versionator ${GIT_ECLASS}
+inherit cmake-utils eutils pax-utils versionator ${GIT_ECLASS}
 
 DESCRIPTION="Qt4/KDE4 IRC client suppporting a remote daemon for 24/7 connectivity."
 HOMEPAGE="http://quassel-irc.org/"
@@ -20,16 +20,17 @@ HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 KEYWORDS=""
 SLOT="0"
-IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl webkit X"
+IUSE="ayatana crypt dbus debug kde monolithic phonon postgres +server +ssl syslog webkit X"
 
 SERVER_RDEPEND="
+	>=x11-libs/qt-script-${QT_MINIMAL}:4
 	crypt? (
 		app-crypt/qca:2
 		app-crypt/qca-ossl
 	)
 	!postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[sqlite] dev-db/sqlite[threadsafe,-secure-delete] )
 	postgres? ( >=x11-libs/qt-sql-${QT_MINIMAL}:4[postgres] )
-	>=x11-libs/qt-script-${QT_MINIMAL}:4
+	syslog? ( virtual/logger )
 "
 
 GUI_RDEPEND="
@@ -69,6 +70,7 @@ REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
+	syslog? ( || ( server monolithic ) )
 	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	dbus? ( || ( X monolithic ) )
@@ -97,6 +99,7 @@ src_configure() {
 		$(cmake-utils_use_with kde)
 		$(cmake-utils_use_with dbus)
 		$(cmake-utils_use_with ssl OPENSSL)
+		$(cmake-utils_use_with syslog)
 		$(cmake-utils_use_with !kde OXYGEN)
 		$(cmake-utils_use_with crypt)
 		"-DEMBED_DATA=OFF"
@@ -109,6 +112,9 @@ src_install() {
 	cmake-utils_src_install
 
 	if use server ; then
+		# needs PAX marking wrt bug#346255
+		pax-mark m "${ED}/usr/bin/quasselcore" || die
+
 		# prepare folders in /var/
 		keepdir "${QUASSEL_DIR}"
 		fowners "${QUASSEL_USER}":"${QUASSEL_USER}" "${QUASSEL_DIR}"
@@ -134,6 +140,11 @@ pkg_postinst() {
 		einfo "	emerge --config =${CATEGORY}/${PF}"
 	fi
 
+	if use server || use monolithic ; then
+		einfo "Quassel can use net-misc/oidentd package if installed on your system."
+		einfo "Consider installing it if you want to run quassel within identd daemon."
+	fi
+
 	# temporary info mesage
 	if use server && [[ $(get_version_component_range 2 ${REPLACING_VERSIONS}) -lt 7 ]]; then
 		echo