Version bump for stable and unstable branch. Dropped old unstable.

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.26-gentoo x86_64

5 files changed, 103 insertions, 19 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/Manifest b/app-admin/rsyslog/Manifest
index 12df8d32caf7..ce78ab4eafe6 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 3-devel/rsyslog-gentoo.conf 2535 RMD160 2e0447f015851e098fdbb62d8eee591633ac9fb1 SHA1 4577c6889112d5597f75b178c3f385da8f90b993 SHA256 d3291188dc03e2709d1b64ed23518c591538e1408be8a96efd4981a9256d91fc
 AUX 3-devel/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SHA1 d7d2ff8a30a1552108f284492c41e177973a7ca3 SHA256 3f72fdae2c58074a99ac71a9de3e36683dc8b2bf7647dcda0c46ef721e6fd7b1
 AUX 3-devel/rsyslog.init 786 RMD160 765cf08ea09f81137c10cd9a7cf0ce53c2a1ded3 SHA1 8f1fefc2a15d6252dd85826ce080b96cf6a76a06 SHA256 9bbfcf94fb6b3efe897117711d5711c2753025e97338245c66988ea163cd28cc
@@ -10,15 +7,10 @@ AUX 3-stable/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SH
 AUX 3-stable/rsyslog.init 787 RMD160 bb3a4c466686ba5b3e6f8c648ca48dabe4c45150 SHA1 d165941f1ed8ea5d3a4024c0b9085c424b3fa8e8 SHA256 bc8c1fc5c34c1e821636c735d72f4f0eb6a20a9d4603364628f7e7307e5f5ff4
 AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
 DIST rsyslog-3.16.1.tar.gz 1063026 RMD160 2a4b42ab9111ffc3111dd0c89105e4fb3b323644 SHA1 22ea16cebfbe5d1df9e23555ac2ae4229da51e3f SHA256 ebcc095119c0c379ff4013b135595ba9ad42812527a6606034457273e11cc916
-DIST rsyslog-3.19.7.tar.gz 1146103 RMD160 e4f333bd7195c2bc0be9beb412018a0c34c4e2ba SHA1 55ec7e8d55c7e6f96f2432dd5786de7c27ac6225 SHA256 e6c06840db6ba802086cab98771c320ddfa75c898587439c34d7bd6c5fa3004c
+DIST rsyslog-3.18.1.tar.gz 1099442 RMD160 7ae14e2d0ba36793d0d7004de26fd2998d0493df SHA1 92681f8b4ccd9e0e008e78f0ce7e55e01621bdd6 SHA256 04780983f9dff8fed5e373a8c2e8d5f42566508aa3dc13d6ade5d87d490eecbe
+DIST rsyslog-3.21.1.tar.gz 1294172 RMD160 e94207b3fbb1c4cacf46b49e4a366e2e33a9805d SHA1 cfa3c2522f5414eea796b9a0a12b10365fc3772d SHA256 263e7cc69340f4b9838c1b0977aa1c691020d5d91065619da183db5f4f53a688
 EBUILD rsyslog-3.16.1.ebuild 2184 RMD160 0c2ddc543511a14ba51f6b15dfe73e560e87b85c SHA1 c6355c699f0c4cb0aa6610f5523f7a4b2960127f SHA256 a5951b44ab471276ac76e77397c1e36ede0581833773fcb16cbe28835b80283c
-EBUILD rsyslog-3.19.7.ebuild 2370 RMD160 7b8242c4901e53492338f63396c0426e7b545b8a SHA1 64d0c162b3bf92fa4bfcb68e6d83700a40a31909 SHA256 39620e2597e9f59b4cb6b21e9c51ac46e87745f8c9abd4195f2f6c2711937d58
-MISC ChangeLog 2875 RMD160 bfcac45085e5de252f8bd53935b1cc231a4c153d SHA1 1c722efa877a23117f567d23f7924e171237eec1 SHA256 7739e19b754a7e7e620a74b2d9ce621e520972a22f05511d8cc17d3d1b4e2973
-MISC metadata.xml 432 RMD160 f5639ccc8c8e574624779666a8adeaec008708bb SHA1 40a0b759f2261f6dfe07ed6c69dd3e9d00a73172 SHA256 3e6c46eca9f97ebcb588a56107ffbd5b77c48b0d15f3a9d64158abc674f16d13
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiKBGsACgkQoeSe8B0zEfx/BgCeKXDXwtxHq10Tw4Jr7VIZAKKh
-+wAAn2fmG0tOx2Aj/UMhvgjXzCJsJkTX
-=KOpu
------END PGP SIGNATURE-----
+EBUILD rsyslog-3.18.1.ebuild 2285 RMD160 72b58ef6ed6a91e675580f5567664cbe9043dbb7 SHA1 7b9d325a172f8d56ba1639b014c6ae4a6aa7831e SHA256 45e543b2bd9d4a2b6f84f4656e5de4f10d025ccdf06586a85656f2460d2ed180
+EBUILD rsyslog-3.21.1.ebuild 2496 RMD160 61da923ca8dc8c5206255038e6a39713b8625e71 SHA1 63f8374b0c901df6a19b31601d569412c1fa31a5 SHA256 f11fffbbddbbf1eb90c1a138e787dace4718980dc289e66b1ca474f7cefeb403
+MISC ChangeLog 3136 RMD160 5c14fb86f992fef25317a9a2cfe4fa209e9d3b96 SHA1 c877fb8e4226e6a0c5d9509cc905442408a1c32a SHA256 2d0595087a335286adfb032d48ae5c480570cba6c747e75e58ceaca3f884d954
+MISC metadata.xml 466 RMD160 154248463e6426a6947e1ef8d11fc18d16ea786d SHA1 80667e3a1bf68f3dab15d35e38a53fed56fc1916 SHA256 83bd8fbd18c96dc972ef351b262f52034a0472adaa0ac42217e6f857d65684fd
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"
 }