Version bump for stable branch. Dropped old stable-branch and obsolete devel-branch ebuild.

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

4 files changed, 22 insertions, 113 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index adf425a06c64..65dd60784cba 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.21 2009/03/15 17:24:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.22 2009/05/26 07:55:59 dev-zero Exp $
+
+*rsyslog-3.22.0 (26 May 2009)
+
+  26 May 2009; Tiziano Müller <dev-zero@gentoo.org> -rsyslog-3.20.2.ebuild,
+  -rsyslog-3.21.10.ebuild, +rsyslog-3.22.0.ebuild:
+  Version bump for stable branch. Dropped old stable-branch and obsolete
+  devel-branch ebuild.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org> rsyslog-3.20.4.ebuild:
   amd64/x86 stable, bug #254287
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index c5da36dc0aa9..226e38943c89 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 816 RMD160 08b0b50754d824b4caae7df41e6cc10febec0355 SHA1 9d3c0128229fd029e69fa429b5ec39df9c635cd0 SHA256 f9034fc2bc390ad46c5ba61cbfd5be3f73dd081165ae22c089f58d978797558f
@@ -9,18 +6,9 @@ AUX 3-stable/rsyslog-gentoo.conf 2535 RMD160 2e0447f015851e098fdbb62d8eee591633a
 AUX 3-stable/rsyslog.conf 448 RMD160 7e793828710e6edc189149322b1bdeb5e2e94079 SHA1 d7d2ff8a30a1552108f284492c41e177973a7ca3 SHA256 3f72fdae2c58074a99ac71a9de3e36683dc8b2bf7647dcda0c46ef721e6fd7b1
 AUX 3-stable/rsyslog.init 817 RMD160 c2c6e3a697ce8763008a630140954fca7ed3e3e9 SHA1 acec0956768f19157b57f9930bc90dbb9bb61af0 SHA256 8999f132424ee7de89ee00f108c0d20bc22479e8d5c6fffddca03a0199b8b07a
 AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
-DIST rsyslog-3.20.2.tar.gz 1298126 RMD160 d583ba1389da07856cef849d06187fda61989fb3 SHA1 612fa5bc52aa52f84d68b0ea8bdbc6e4150a6543 SHA256 e5406a8d7571d0b7f035ad647035bb5b52685316acc55a4fb37c4caabdf63676
 DIST rsyslog-3.20.4.tar.gz 1304299 RMD160 27922bfd174e935f17d3789f6c4538ba4633cc88 SHA1 e4c6f02eb7f22dfdfe32ff7a84d7b33466a0a2c9 SHA256 adc179e5996c9769ed5d46c68e0db07ed6c87a38982de9165105c69cd8786342
-DIST rsyslog-3.21.10.tar.gz 1325611 RMD160 de1a09f5c421c620d75f967b601afe409116377a SHA1 32d30d619453e18464101e0009ab6e1e2c90c38e SHA256 212bca11613247ebc4652787acf4087ef7c9faf4abc3a254e142bd04f709fa34
-EBUILD rsyslog-3.20.2.ebuild 2370 RMD160 d52b4a59fc29f3ee7050eadbb0570026db4d6b5a SHA1 91f8fb28c356138c716b29b33fa75d6e4e59e4fb SHA256 3edfad5b1b19fa7b8a923787d7cc11496abeaec4b1806b4de37e91030e8074ba
+DIST rsyslog-3.22.0.tar.gz 1335136 RMD160 1b3dc5478dee1dde935db532c958aca89c765a8b SHA1 e667387c49d1d53a98f82225bcd235d291227120 SHA256 efbed2c534833e25ed7477a94a4a259310d2b8f1326d39e0789364333285ae7d
 EBUILD rsyslog-3.20.4.ebuild 2366 RMD160 77392dd95099c998bbdd5d8d828beb5bfc1031d1 SHA1 0d86a2b2dd75faedd186762e499ceb45c177db07 SHA256 9c861097bcb5e23c776083b840dad0a9ed2e18de17ed381e6ed3d39c8d35855c
-EBUILD rsyslog-3.21.10.ebuild 2658 RMD160 f892e1cebf4946f424c70d53135db1ccb78dde02 SHA1 3529d080d0845e0cea5c9bd4e343205d88d229d3 SHA256 aeaaf879942ba011c99e46709e41de677da6e600f9762f81fd43759e7f92b326
-MISC ChangeLog 5472 RMD160 7c328456d0200c79297312245c393bf549fda1a1 SHA1 b9e389047b4c3b0ebf4acd5d7a726500b8204dec SHA256 c4adb09da5a7c39929cfa5a6f647325fad40b7d0f6924302ea6a5f2d12621df0
+EBUILD rsyslog-3.22.0.ebuild 2469 RMD160 7b572c955a31cf4a4a945dbf7e1310e33ab2c325 SHA1 6139d7d2e2892ca2114d13b3ea6740c544e5c0b5 SHA256 c40409a95790501660ef0e90b28da1f8e3c81c4c3c4160a8125d69348de5f7e5
+MISC ChangeLog 5730 RMD160 6fd9c6d14273b7908b228166c09d94a62eeb710f SHA1 8fb7782084cf2a2b873798f0094b81934f31c789 SHA256 443bd065cfc69327616ef2b1a08b7a8262a3527140909f11f1dbd25009081797
 MISC metadata.xml 466 RMD160 154248463e6426a6947e1ef8d11fc18d16ea786d SHA1 80667e3a1bf68f3dab15d35e38a53fed56fc1916 SHA256 83bd8fbd18c96dc972ef351b262f52034a0472adaa0ac42217e6f857d65684fd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkm9Ob8ACgkQkKaRLQcq0GJHSgCdFkRSmaMhLCw5xeO6FnGSEvO4
-AscAn1Yc1Qhy5RQnao3RaLWDte5IVJyE
-=zGtu
------END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/rsyslog-3.21.10.ebuild b/app-admin/rsyslog/rsyslog-3.21.10.ebuild
deleted file mode 100644
index dbd0eec96430..000000000000
--- a/app-admin/rsyslog/rsyslog-3.21.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.21.10.ebuild,v 1.1 2009/02/13 07:49:21 dev-zero Exp $
-
-inherit 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 ~hppa ~x86"
-IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
-
-DEPEND="kerberos? ( virtual/krb5 )
-	dbi? ( dev-db/libdbi )
-	gnutls? ( net-libs/gnutls )
-	mysql? ( virtual/mysql )
-	postgres? ( virtual/postgresql-base )
-	relp? ( >=dev-libs/librelp-0.1.1 )
-	snmp? ( net-analyzer/net-snmp )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-PROVIDE="virtual/logger"
-
-BRANCH="3-devel"
-
-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 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 \
-		--disable-imdiag \
-		$(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
-}
-
-pkg_postinst() {
-	ewarn "You installed a beta version of rsyslog, please do report bugs"
-	ewarn "with the software directly to upstream. Please read more about"
-	ewarn "stable or unstable branches at http://www.rsyslog.com"
-}
diff --git a/app-admin/rsyslog/rsyslog-3.20.2.ebuild b/app-admin/rsyslog/rsyslog-3.22.0.ebuild
index ed17340b384d..90eec5b48623 100644
--- a/app-admin/rsyslog/rsyslog-3.20.2.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.22.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.20.2.ebuild,v 1.1 2008/12/08 12:53:06 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.22.0.ebuild,v 1.1 2009/05/26 07:55:59 dev-zero Exp $
+
+EAPI="2"
 
 inherit versionator
 
@@ -9,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="debug kerberos dbi gnutls mysql postgres relp snmp zlib"
 
 DEPEND="kerberos? ( virtual/krb5 )
@@ -25,7 +27,10 @@ PROVIDE="virtual/logger"
 
 BRANCH="3-stable"
 
-src_compile() {
+# need access to certain device nodes
+RESTRICT="test"
+
+src_configure() {
 	# Maintainer notes:
 	# * rsyslog-3 doesn't support single threading anymore
 	# * rfc3195 needs a library and development of that library
@@ -43,6 +48,7 @@ src_compile() {
 		$(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) \
@@ -51,11 +57,11 @@ src_compile() {
 		--enable-rsyslogrt \
 		--enable-rsyslogd \
 		--enable-mail \
+		--disable-imdiag \
 		$(use_enable relp) \
 		--disable-rfc3195 \
 		--enable-imfile \
 		--disable-imtemplate
-	emake || die "emake failed"
 }
 
 src_install() {