4 files changed, 97 insertions, 5 deletions
diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 48389e942b1c..b69977416204 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.9 2008/07/25 16:50:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.10 2008/07/31 08:43:17 dev-zero Exp $
+
+*rsyslog-3.21.1 (31 Jul 2008)
+*rsyslog-3.18.1 (31 Jul 2008)
+
+  31 Jul 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.18.1.ebuild,
+  -rsyslog-3.19.7.ebuild, +rsyslog-3.21.1.ebuild:
+  Version bump for stable and unstable branch. Dropped old unstable.
 
   25 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 068027671d2a..9e315efe13c3 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -8,6 +8,6 @@
 <use>
 	<flag name='dbi'>Add support for logging into various databases through
 		<pkg>dev-db/libdbi</pkg></flag>
-	<flag name='relp'>Add support for the Reliable Event Logging Protocol</flag>
+	<flag name='relp'>Add support for the Reliable Event Logging Protocol using <pkg>dev-libs/librelp</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-admin/rsyslog/rsyslog-3.18.1.ebuild b/app-admin/rsyslog/rsyslog-3.18.1.ebuild
new file mode 100644
index 000000000000..082299c24da8
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-3.18.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.18.1.ebuild,v 1.1 2008/07/31 08:43:17 dev-zero Exp $
+
+inherit eutils versionator
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more."
+HOMEPAGE="http://www.rsyslog.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
+
+DEPEND="kerberos? ( virtual/krb5 )
+	dbi? ( dev-db/libdbi )
+	mysql? ( virtual/mysql )
+	postgres? ( virtual/postgresql-base )
+	relp? ( dev-libs/librelp )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+PROVIDE="virtual/logger"
+
+BRANCH="3-stable"
+
+src_compile() {
+	# Maintainer notes:
+	# * rsyslog-3 doesn't support single threading anymore
+	# * rfc3195 needs a library and development of that library
+	#   is suspended
+	econf \
+		--enable-largefile \
+		--enable-regexp \
+		$(use_enable zlib) \
+		$(use_enable kerberos gssapi-krb5) \
+		--enable-pthreads \
+		--enable-klog \
+		--enable-unix \
+		--enable-inet \
+		--enable-fsstnd \
+		$(use_enable debug) \
+		$(use_enable debug rtinst) \
+		$(use_enable debug valgrind) \
+		$(use_enable mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable dbi libdbi) \
+		$(use_enable snmp) \
+		--enable-rsyslogd \
+		--enable-mail \
+		$(use_enable relp) \
+		--disable-rfc3195 \
+		--enable-imfile \
+		--disable-imtemplate
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/share/doc/${PF}/scripts/mysql
+	doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+
+	insinto /usr/share/doc/${PF}/scripts/pgsql
+	doins plugins/ompgsql/createDB.sql
+
+	elog "SQL scripts to create the tables for MySQL or PostgreSQL have been installed to:"
+	elog "  /usr/share/doc/${PF}/scripts"
+
+	dodoc AUTHORS ChangeLog doc/rsyslog-example.conf
+	dohtml doc/*
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/rsyslog-gentoo.conf" rsyslog.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/rsyslog.logrotate" rsyslog
+
+	newconfd "${FILESDIR}/${BRANCH}/rsyslog.conf" rsyslog
+	newinitd "${FILESDIR}/${BRANCH}/rsyslog.init" rsyslog
+}
diff --git a/app-admin/rsyslog/rsyslog-3.19.7.ebuild b/app-admin/rsyslog/rsyslog-3.21.1.ebuild
index ccff8e01b8cd..ad5e420f2fb4 100644
--- a/app-admin/rsyslog/rsyslog-3.19.7.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.21.1.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/app-admin/rsyslog/rsyslog-3.19.7.ebuild,v 1.2 2008/06/16 02:02:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.21.1.ebuild,v 1.1 2008/07/31 08:43:17 dev-zero Exp $
 
 inherit autotools versionator
 
@@ -43,17 +43,21 @@ src_compile() {
 		--enable-fsstnd \
 		$(use_enable debug) \
 		$(use_enable debug rtinst) \
+		$(use_enable debug valgrind) \
+		$(use_enable debug diagtools) \
 		$(use_enable mysql) \
 		$(use_enable postgres pgsql) \
 		$(use_enable dbi libdbi) \
 		$(use_enable snmp) \
+		$(use_enable gnutls) \
+		--enable-rsyslogrt \
 		--enable-rsyslogd \
 		--enable-mail \
+		$(use_enable debug imdiag) \
 		$(use_enable relp) \
 		--disable-rfc3195 \
 		--enable-imfile \
-		--disable-imtemplate \
-		$(use_enable gnutls)
+		--disable-imtemplate
 	emake || die "emake failed"
 }