Version bump (both stable and testing branches).

Package-Manager: portage-2.1.5_rc6

4 files changed, 96 insertions, 14 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index f2c287bae7d2..f631e09be280 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.2 2008/04/09 17:32:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.3 2008/04/25 14:56:08 dev-zero Exp $
+
+*rsyslog-3.17.1 (25 Apr 2008)
+*rsyslog-3.16.0 (25 Apr 2008)
+
+  25 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> +rsyslog-3.16.0.ebuild,
+  -rsyslog-3.17.0.ebuild, +rsyslog-3.17.1.ebuild:
+  Version bump (both stable and testing branches).
 
 *rsyslog-3.17.0 (09 Apr 2008)
 *rsyslog-3.14.1 (09 Apr 2008)
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index bb547ad72cde..4cb425cfbf43 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -8,8 +8,10 @@ AUX 3-stable/rsyslog.init 787 RMD160 bb3a4c466686ba5b3e6f8c648ca48dabe4c45150 SH
 AUX 3-stable/rsyslog.logrotate 390 RMD160 8639ed6de74a17b5ea895d4b1a92c34242c5ec0e SHA1 c611b0df1808c621a2ab4d200cb42bd51033e282 SHA256 ab84fcdd6bd17a4b2e1b53eb42e96914197a66e04be1bcdf4b43051f1bde4dc2
 AUX 3.14.1-implicit_declaration.patch 1529 RMD160 2d43706c9b31abd9d8b95fb1798f8ae4718ed22c SHA1 33cd80b95fa621a17829181229eb565f20f465f2 SHA256 cbc9e4fd5c80cd702396ff88ffb4246e7953be1d8ec6cc67c1aba608ddf7123c
 DIST rsyslog-3.14.1.tar.gz 1057895 RMD160 51577f6bc5065272d9d604e92f25b86ce302d34a SHA1 ae5d614389ec9bb7da12ae1f279c4ad3b93b6232 SHA256 aa6930d713880299f32717db198f5a35de08d983f4d33ce6ec241fa8135afffc
-DIST rsyslog-3.17.0.tar.gz 1075256 RMD160 e921ddde2be0c539054ed205a0fad9b1e21a724c SHA1 226ac11aad44288acac30756723c27a65fa4bd02 SHA256 2d4208c90ab7b48b1c3d227f7b728334da64938a08ceff47b4676624d3aeffd7
+DIST rsyslog-3.16.0.tar.gz 1062775 RMD160 869a48bbe71be0eb60c535fb6cbafdca2dd09b70 SHA1 9a126d5e196638c30780de921321bd588734b263 SHA256 5062d9e554f0b3c031c3249c0c63f22e14df75767da5a66641d4722ab53e5a63
+DIST rsyslog-3.17.1.tar.gz 1086271 RMD160 52c3e775935ac9e483935bf943577309a0df5253 SHA1 08855c609b974551e1cd396c2b95bffc3be273fb SHA256 015318c66b8e784c25292b522f18ac0aceaa5ec76182e538df5d8642689ae5f8
 EBUILD rsyslog-3.14.1.ebuild 2234 RMD160 4d40749417d7ec14149a60c7d17cf47488d049ac SHA1 8ca964b57e6a57b5f591946b4b280e8bc73c116a SHA256 72893722f3e4df78fa3805b247776c96329a7009449b9ab56f054ce235684fd8
-EBUILD rsyslog-3.17.0.ebuild 2260 RMD160 118af23ecbc57aa5ed0dc980e0e241a0e3ac76ee SHA1 531960386329699b60a8bb095590adae2689981f SHA256 9cd20388429a203e434bdc1686d30a8dd96212c03be8509c7c6fd96d10d99e68
-MISC ChangeLog 1313 RMD160 a0c1293167b06483216a3d15d21c1593a4665eb7 SHA1 ce29181fd88b69e900c625390712a3f67d9c45dc SHA256 55b0b4b07a9cb8cee609a0f67e4bcc3caadcd4aed7e0973033ff61140c5c1c67
+EBUILD rsyslog-3.16.0.ebuild 2143 RMD160 e8bcb335ef37c87ab3990ab5e9fe4daa91494f08 SHA1 ea506c5fa9849ba80055f434be579f4aceeeb9ea SHA256 a75f0b2f13ee6ae2d9494aea6c970774535896dc3e049ce3a84f1f58360aa6df
+EBUILD rsyslog-3.17.1.ebuild 2286 RMD160 a621cebb371d4727795bea0cc5f761579c7d5c5c SHA1 333997ce463e7f3993ae314f77eac56e055b469c SHA256 fcd9737b614d655321197de55293156446ff63e6689f61e175663852235420ca
+MISC ChangeLog 1553 RMD160 feedab2e02e9bb9e11d78b34e91954b43412a8e8 SHA1 1ef4e53d5fa6ab02fdb3924a4dbfbb30f0f35307 SHA256 5da1fcd9b2e04df8bc7da2f7b805eead3c04912ee72c7113907f2557e970573f
 MISC metadata.xml 234 RMD160 71429d1d4a30b5ab923cc277f1697e48cd5778cb SHA1 e4587261387a7dad22cdba0a6f2a928dc982c32a SHA256 3299defd0e5e3780bf8db22ac755b39ecc0d5ae97b62507f6795c1dd74b4949b
diff --git a/app-admin/rsyslog/rsyslog-3.16.0.ebuild b/app-admin/rsyslog/rsyslog-3.16.0.ebuild
new file mode 100644
index 000000000000..e2b4a30bec23
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-3.16.0.ebuild
@@ -0,0 +1,77 @@
+# 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.16.0.ebuild,v 1.1 2008/04/25 14:56:08 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"
+IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
+
+DEPEND="kerberos? ( virtual/krb5 )
+	dbi? ( dev-db/libdbi )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/libpq )
+	relp? ( dev-libs/librelp )
+	snmp? ( net-analyzer/net-snmp )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+BRANCH="3-stable"
+
+src_compile() {
+	# Maintainer notes:
+	# * rsyslog-3 doesn't support single threading anymore
+	# * rfc3195 needs a library
+	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 mysql) \
+		$(use_enable postgres pgsql) \
+		$(use_enable dbi libdbi) \
+		$(use_enable snmp) \
+		--enable-rsyslogd \
+		$(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.17.0.ebuild b/app-admin/rsyslog/rsyslog-3.17.1.ebuild
index 0f9f891c0bec..99a97d4fd7fe 100644
--- a/app-admin/rsyslog/rsyslog-3.17.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-3.17.1.ebuild
@@ -1,13 +1,13 @@
 # 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.17.0.ebuild,v 1.1 2008/04/09 17:32:54 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-3.17.1.ebuild,v 1.1 2008/04/25 14:56:08 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"
+LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug kerberos dbi mysql postgres relp snmp zlib"
@@ -23,17 +23,12 @@ RDEPEND="${DEPEND}"
 
 BRANCH="3-devel"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/3.14.1-implicit_declaration.patch"
-}
-
 src_compile() {
 	# Maintainer notes:
 	# * rsyslog-3 doesn't support single threading anymore
 	# * rfc3195 needs a library
+	# * OpenSSL detection is present in ./configure but nothing
+	#   in the code actually needs it
 	econf \
 		--enable-largefile \
 		--enable-regexp \
@@ -55,7 +50,8 @@ src_compile() {
 		$(use_enable relp) \
 		--disable-rfc3195 \
 		--enable-imfile \
-		--disable-imtemplate
+		--disable-imtemplate \
+		--disable-openssl
 	emake || die "emake failed"
 }