version bump fix #546822 thx to Thomas D., drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 116 insertions, 40 deletions

diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog
index 77a6679f594e..c7ccc91d9eec 100644
--- a/app-admin/rsyslog/ChangeLog
+++ b/app-admin/rsyslog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.139 2015/04/19 09:46:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.140 2015/04/20 13:06:49 ultrabug Exp $
+
+*rsyslog-8.9.0 (20 Apr 2015)
+
+  20 Apr 2015; Ultrabug <ultrabug@gentoo.org> -rsyslog-8.4.2.ebuild,
+  +rsyslog-8.9.0.ebuild, metadata.xml:
+  version bump fix #546822 thx to Thomas D., drop old
 
   19 Apr 2015; Pacho Ramos <pacho@gentoo.org> rsyslog-8.7.0-r2.ebuild:
   x86 stable wrt bug #536786
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index b64acb8ed21d..5a149f20fa35 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -12,18 +12,18 @@ AUX 8-stable/rsyslog.conf 1562 SHA256 fc70a94213b5eb519febf9aa7d758ee9526433bcc5
 AUX 8-stable/rsyslog.confd 1140 SHA256 f0b15a0334f6177a6cf23cb9b169302c75745dc30857f24a7d11892feb6b1ee4 SHA512 8501be8d0abc166994863db61afa5a4ef120aaec601d86fb71711b557741d39b29b96a4d688e7af6ad8d5d15a1257821ca299c5f7391f2ce66cd95e33ea2ff7c WHIRLPOOL 0a3617defa10acfa693a3339e1f7ec69c9272b44aac6fda30b49452f32ea7037743acfd871cea025f1e584639725588286056db6e17663c2806ed47088600d35
 AUX 8-stable/rsyslog.initd 1711 SHA256 204c66d2b7d4d20115acc7499708cf538538fe1c100281ad55f909508041fb19 SHA512 fa0c447243c7aa539a6a0877a4dbfc3b7111e9e0fb3df29d866eb39388c074b7452b644fa25da4311c1513180e11f2929408833f430f03a1835b6d36e19e5a78 WHIRLPOOL d4004080a86739121d82aae33bb0634e074c9bcc3764e7cac0da52433e61450e706367f95378ed8b135a28b9c9fd3041cabefec30ca607770bae47ca53dec72e
 AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
-DIST rsyslog-8.4.2.tar.gz 1938563 SHA256 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a SHA512 f3a8af9c859fac4f490d8836f2083125c2daddf0647df06318628ad92cb63538612ecdc78f725bd3e3725a3c79f0c06a67fafe6a2fd5c9194fa18020de6d3847 WHIRLPOOL b4a17389215202158721739b216f43602668c62d52f169362a548f8db0fdc2c8e8114eb8b12727f638ede3077f1172d5077eb9dc64c5f29e28282cee145e098e
 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d
-DIST rsyslog-doc-8.4.2.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
+DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 942cccc2cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
-EBUILD rsyslog-8.4.2.ebuild 9553 SHA256 7a4c84cef6a9dfd89be22ca8736487597acf5ebe022ab6e7fbadd0f30f1e3c44 SHA512 29c00a2bc9c879e75a14af69f82c0a4eb734d82862a5e02c1c194a3aff8191f22ba32afb256683a3e2d68374d89a30b1a16446180f35a6f2ec53d6b1a326ca1f WHIRLPOOL c1624c6f3fe27c233a8193b1ce7010be36f8c8c3ac2c4a4115cd1ff5da78b5b17924ce3a9a72d4190abb9a1415b184da84427c3f2f5b74de99b04ef586d16993
+DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0
 EBUILD rsyslog-8.7.0-r2.ebuild 11315 SHA256 210abd06574cc152f7766be48925aa72a912c64a939689a6b12f8ed6082ac9e1 SHA512 fca0f8a67145e40b7dfb7e04e281a35f2df28c06eaa2f9cff8d91a9d911e12dd20fcc6aaa48e248ab35d4c2648db837ec550034d01d5e61d1b7d56e1c4e4c326 WHIRLPOOL eb0d6f7068297a3c64be0a9076fe13c9ea3d361fa9b055b2c83f89548843225afe541660427637d2a63691e4400d13de1a7f07480af90b034b38dab2a98534c6
-MISC ChangeLog 26640 SHA256 3c54f1553032e17b9b17fab92855d194263677b834fcd4b5d3100fd79f114292 SHA512 683cfe6cd540f8f19371453af8378fc687e6965ec4e0bfef43e8f100853024b566182b1120f6101fce7e40113b7a8389aafe02f53970d0e474311bf5ddecc6c0 WHIRLPOOL 238882552cc32512bfdd60fda222d59f1697e1969e63a06559761524bdfd0945eefb3acfe38fd2dbf321ad01596630429c7c323933e867e3afd32a60e601e57e
-MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b
+EBUILD rsyslog-8.9.0.ebuild 11029 SHA256 e5545d65f27079125ed4002e436689f65f642b896f54f575c3de50754c489422 SHA512 66dbe2c066482ebaa40d37c7b98982be46f1272a242a30a8829bc471d2b27ffea21769b4e1d21ee19831fa671e654f72747ec0c989c622e7f59856e557d27215 WHIRLPOOL 510691c9c3a77407e145c4f3607f1813a0627be1c1c23a0bd1b71be0b3d3afeedacc1e165ccb5d49e2013aeb2d4baf11397761f7798ff14928638f15adf6b68c
+MISC ChangeLog 26836 SHA256 00f62ec24e67a62edb77fa4d17812f6d736ac8ef3a20dce29bb2b78e575ece01 SHA512 bb52b5ffdfcbe0d1fc51a05dcacc042ff876b9669a875eafdd8e4c240c28a2902ef5200c4f8d31815ca45440f602fe85933d059b55b4f940e4b624c8340a6243 WHIRLPOOL 3f9e1c0cede4a17dbe03f1873fecbf0549a863800a80938723dd86214854f0e47c8d092c1ae381ee82644869ef72dd8915f1ceac5dc4676986128dca0e583bbc
+MISC metadata.xml 2782 SHA256 71c1f95cddbfcdd383e15a9a89cfed72f34d52e0f664775016466f424d975301 SHA512 4e49d87b5d64a15ab85206cc7592c76889bc91a2566d6de71348a86572e3ff731e6549d484ec61bec968d8f1c9ac844e919ea58a5f151d71e111e54444fa847a WHIRLPOOL 042a4e2ce4933d5721c8802b3ea81effc8a38e594b4389b098dd8901a8c8164740c70f577a176b82e0bf85c48ff0605c94f0b5727aeddf068ff2506076d1fcb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUzeXMACgkQCaWpQKGI+9SNeACeNX0QJcIcZFQNJFxC61mqv9m0
-xvIAn0yn0dZ9LAU21omtxHg51AesNTS3
-=zv31
+iF4EAREIAAYFAlU0+eoACgkQKiQSS7ZY+hPfAwEAjjhVHsH7tCfDaz/pNxva3UVj
+UAuN3joC7xjGWue3scwBAMyx3lQqUGrpixxIEeL8roEq5W+EcsQ+DQxqp+o2xLhg
+=pDxp
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index 0e3b66634978..2be62ca5ed75 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -21,7 +21,6 @@
 		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
 		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
 		<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
-		<flag name="oracle">Build the Oracle database output module (requires <pkg>dev-db/oracle-instantclient-basic</pkg>)</flag>
 		<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
 		<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
 		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
diff --git a/app-admin/rsyslog/rsyslog-8.4.2.ebuild b/app-admin/rsyslog/rsyslog-8.9.0.ebuild
index 5c8dc2e96912..0dc03880c8ce 100644
--- a/app-admin/rsyslog/rsyslog-8.4.2.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.2.ebuild,v 1.6 2014/12/28 14:45:28 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.9.0.ebuild,v 1.1 2015/04/20 13:06:49 ultrabug Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -9,15 +9,36 @@ inherit autotools-utils eutils systemd
 
 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="
-	http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-"
+
+BRANCH="8-stable"
+
+PATCHES=(
+	"${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
+)
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="
+		git://github.com/rsyslog/${PN}.git
+		https://github.com/rsyslog/${PN}.git
+	"
+
+	DOC_REPO_URI="
+		git://github.com/rsyslog/${PN}-doc.git
+		https://github.com/rsyslog/${PN}-doc.git
+	"
+
+	inherit git-r3
+else
+	SRC_URI="
+		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 ~arm hppa x86"
 SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
 
 RDEPEND="
 	>=dev-libs/json-c-0.11:=
@@ -33,16 +54,15 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	normalize? (
 		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-1.0.0:=
+		>=dev-libs/liblognorm-1.1.0:=
 	)
 	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
-	postgres? ( >=dev-db/postgresql-8.4.20 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
 	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
 	redis? ( >=dev-libs/hiredis-0.11.0 )
 	relp? ( >=dev-libs/librelp-1.2.5 )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= )
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? ( >=net-libs/gnutls-2.12.23 )
 	systemd? ( >=sys-apps/systemd-208 )
@@ -50,10 +70,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-BRANCH="8-stable"
-
-# Test suite requires a special setup or will always fail
-RESTRICT="test"
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+fi
 
 # Maitainer note : open a bug to upstream
 # showing that building in a separate dir fails
@@ -67,18 +86,38 @@ DOCS=(
 	"${FILESDIR}"/${BRANCH}/README.gentoo
 )
 
-PATCHES=( "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS.patch )
-
 src_unpack() {
-	unpack ${P}.tar.gz
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
 
 	if use doc; then
-		local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
-		cd "${S}" || die "Cannot change dir into '$S'"
-		mkdir docs || die "Failed to create docs directory"
-		cd docs || die "Failed to change dir into '${S}/docs'"
-		unpack ${doc_tarball}
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [ -n "${EGIT_BRANCH}" ]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [ -n "${_EGIT_BRANCH}" ]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			local doc_tarball="${PN}-doc-${PV}.tar.gz"
+
+			cd "${S}" || die "Cannot change dir into '$S'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${doc_tarball}
+		fi
 	fi
 }
 
@@ -100,11 +139,13 @@ src_configure() {
 
 	local myeconfargs=(
 		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
 		# Input Plugins without depedencies
+		--enable-imdiag
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		--enable-imttcp
 		# Message Modificiation Plugins without depedencies
 		--enable-mmanon
 		--enable-mmaudit
@@ -124,19 +165,16 @@ src_configure() {
 		--enable-pmciscoios
 		--enable-pmcisconames
 		--enable-pmlastmsg
-		--enable-pmrfc3164sd
 		--enable-pmsnare
 		# DB
 		$(use_enable dbi libdbi)
 		$(use_enable mongodb ommongodb)
 		$(use_enable mysql)
-		$(use_enable oracle)
 		$(use_enable postgres pgsql)
 		$(use_enable redis omhiredis)
 		# Debug
 		$(use_enable debug)
 		$(use_enable debug diagtools)
-		$(use_enable debug imdiag)
 		$(use_enable debug memcheck)
 		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
@@ -165,6 +203,39 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [ -z "${_has_increased_ulimit}" ]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv $FEATURES; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
 src_install() {
 	use doc && HTML_DOCS=( "${S}/docs/build/" )
 	autotools-utils_src_install
@@ -188,7 +259,7 @@ src_install() {
 
 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+		doins plugins/ommysql/createDB.sql
 	fi
 
 	if use postgres; then