Attachment #395932 for bug #536784

Lines 16-21 Link Here

(-)old/app-admin/rsyslog/metadata.xml (+1 lines)
16	<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>	16	<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
17	<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>	17	<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
18	<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>	18	<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
		19	<flag name="kafka">Build the Apache Kafka output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
19	<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>	20	<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
20	<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>	21	<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/libmongo-client</pkg>)</flag>
21	<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>	22	<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>




# 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.6.0.ebuild,v 1.2 2014/12/28 14:45:29 titanofold Exp $


	"

	inherit git-r3
	KEYWORDS=""
else
	SRC_URI="
		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz


LICENSE="GPL-3 LGPL-3 Apache-2.0"
SLOT="0"
IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kafka kerberos mongodb mysql normalize omudpspoof"
IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"

RDEPEND="
	>=dev-libs/json-c-0.11:=

	elasticsearch? ( >=net-misc/curl-7.35.0 )
	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
	kafka? ( >=dev-libs/librdkafka-0.8.5:= )
	kerberos? ( virtual/krb5 )
	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
	mysql? ( virtual/mysql )
	normalize? (
		>=dev-libs/libee-0.4.0
		>=dev-libs/liblognorm-1.1.0:=
	)
	omudpspoof? ( >=net-libs/libnet-1.1.6 )
	postgres? ( >=dev-db/postgresql-8.4.20 )


BRANCH="8-stable"

if [[ ${PV} < "8.7" ]]; then
	# Test suite is broken in v8.6.0 release tarball
	# Upstream is notified; Will be fixed with v8.7.0 in January
	RESTRICT="test"
fi

# Maitainer note : open a bug to upstream
# showing that building in a separate dir fails
AUTOTOOLS_IN_SOURCE_BUILD=1

		$(use_enable elasticsearch)
		$(use_enable gcrypt libgcrypt)
		$(use_enable jemalloc)
		$(use_enable kafka omkafka)
		$(use_enable kerberos gssapi-krb5)
		$(use_enable normalize mmnormalize)
		$(use_enable omudpspoof)


	if use mysql; then
		insinto /usr/share/doc/${PF}/scripts/mysql
		doins plugins/ommysql/createDB.sql
	fi

	if use postgres; then

Return to bug 536784

Lines 1-4 Link Here

(-)old/app-admin/rsyslog/rsyslog-8.6.0.ebuild (-11 / +7 lines)
1	# Copyright 1999-2014 Gentoo Foundation	1	# Copyright 1999-2015 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild,v 1.2 2014/12/28 14:45:29 titanofold Exp $	3	# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild,v 1.2 2014/12/28 14:45:29 titanofold Exp $
4		4
Lines 22-28 if [[ ${PV} == "9999" ]]; then Link Here
22	"	22	"
23		23
24	inherit git-r3	24	inherit git-r3
25	KEYWORDS=""
26	else	25	else
27	SRC_URI="	26	SRC_URI="
28	http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz	27	http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
Lines 33-39 fi Link Here
33		32
34	LICENSE="GPL-3 LGPL-3 Apache-2.0"	33	LICENSE="GPL-3 LGPL-3 Apache-2.0"
35	SLOT="0"	34	SLOT="0"
36	IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"	35	IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kafka kerberos mongodb mysql normalize omudpspoof"
		36	IUSE+=" postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
37		37
38	RDEPEND="	38	RDEPEND="
39	>=dev-libs/json-c-0.11:=	39	>=dev-libs/json-c-0.11:=
Lines 44-55 RDEPEND=" Link Here
44	elasticsearch? ( >=net-misc/curl-7.35.0 )	44	elasticsearch? ( >=net-misc/curl-7.35.0 )
45	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )	45	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
46	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )	46	jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
		47	kafka? ( >=dev-libs/librdkafka-0.8.5:= )
47	kerberos? ( virtual/krb5 )	48	kerberos? ( virtual/krb5 )
48	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )	49	mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
49	mysql? ( virtual/mysql )	50	mysql? ( virtual/mysql )
50	normalize? (	51	normalize? (
51	>=dev-libs/libee-0.4.0	52	>=dev-libs/libee-0.4.0
52	>=dev-libs/liblognorm-1.0.0:=	53	>=dev-libs/liblognorm-1.1.0:=
53	)	54	)
54	omudpspoof? ( >=net-libs/libnet-1.1.6 )	55	omudpspoof? ( >=net-libs/libnet-1.1.6 )
55	postgres? ( >=dev-db/postgresql-8.4.20 )	56	postgres? ( >=dev-db/postgresql-8.4.20 )
Lines 71-82 fi Link Here
71		72
72	BRANCH="8-stable"	73	BRANCH="8-stable"
73		74
74	if [[ ${PV} < "8.7" ]]; then
75	# Test suite is broken in v8.6.0 release tarball
76	# Upstream is notified; Will be fixed with v8.7.0 in January
77	RESTRICT="test"
78	fi
79
80	# Maitainer note : open a bug to upstream	75	# Maitainer note : open a bug to upstream
81	# showing that building in a separate dir fails	76	# showing that building in a separate dir fails
82	AUTOTOOLS_IN_SOURCE_BUILD=1	77	AUTOTOOLS_IN_SOURCE_BUILD=1
Lines 180-185 src_configure() { Link Here
180	$(use_enable elasticsearch)	175	$(use_enable elasticsearch)
181	$(use_enable gcrypt libgcrypt)	176	$(use_enable gcrypt libgcrypt)
182	$(use_enable jemalloc)	177	$(use_enable jemalloc)
		178	$(use_enable kafka omkafka)
183	$(use_enable kerberos gssapi-krb5)	179	$(use_enable kerberos gssapi-krb5)
184	$(use_enable normalize mmnormalize)	180	$(use_enable normalize mmnormalize)
185	$(use_enable omudpspoof)	181	$(use_enable omudpspoof)
Lines 257-263 src_install() { Link Here
257		253
258	if use mysql; then	254	if use mysql; then
259	insinto /usr/share/doc/${PF}/scripts/mysql	255	insinto /usr/share/doc/${PF}/scripts/mysql
260	doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}	256	doins plugins/ommysql/createDB.sql
261	fi	257	fi
262		258
263	if use postgres; then	259	if use postgres; then