Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 12 insertions, 96 deletions

diff --git a/net-analyzer/argus-clients/ChangeLog b/net-analyzer/argus-clients/ChangeLog
index 874d514ebe93..a83e2c49b31b 100644
--- a/net-analyzer/argus-clients/ChangeLog
+++ b/net-analyzer/argus-clients/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/argus-clients
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.68 2014/06/14 02:22:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/ChangeLog,v 1.69 2014/07/10 19:03:45 jer Exp $
+
+*argus-clients-3.0.8_rc6 (10 Jul 2014)
+
+  10 Jul 2014; Jeroen Roovers <jer@gentoo.org> -argus-clients-3.0.7.33.ebuild,
+  -argus-clients-3.0.7.34.ebuild, +argus-clients-3.0.8_rc6.ebuild,
+  -files/argus-clients-3.0.7.18-sasl.patch:
+  Version bump.
 
 *argus-clients-3.0.7.34 (14 Jun 2014)
 
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.34.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.7.34.ebuild
deleted file mode 100644
index 299c022166f0..000000000000
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.34.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.34.ebuild,v 1.1 2014/06/14 02:22:18 jer Exp $
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Clients for net-analyzer/argus"
-HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ft geoip mysql sasl tcpd"
-
-MY_CDEPEND="
-	net-analyzer/rrdtool[perl]
-	net-libs/libpcap
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	ft? ( net-analyzer/flow-tools )
-	geoip? ( dev-libs/geoip )
-	mysql? ( virtual/mysql )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-
-RDEPEND="
-	${MY_CDEPEND}
-"
-
-DEPEND="
-	${MY_CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \
-		"${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
-
-	sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && touch .debug
-	econf \
-		$(use_with ft libft) \
-		$(use_with geoip GeoIP /usr/) \
-		$(use_with sasl) \
-		$(use_with tcpd wrappers) \
-		$(use_with mysql)
-}
-
-src_compile() {
-	# racurses uses both libncurses and libtinfo, if present
-	emake \
-		CCOPT="${CFLAGS} ${LDFLAGS}" \
-		RANLIB=$(tc-getRANLIB) \
-		CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin bin/ra*
-	dodoc ChangeLog CREDITS README CHANGES
-	doman man/man{1,5}/*
-}
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.7.33.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8_rc6.ebuild
index f32bbb848d98..12bfd59a5c6f 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.7.33.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8_rc6.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.7.33.ebuild,v 1.1 2014/06/12 20:02:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus-clients/argus-clients-3.0.8_rc6.ebuild,v 1.1 2014/07/10 19:03:45 jer Exp $
 
 EAPI=5
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Clients for net-analyzer/argus"
 HOMEPAGE="http://www.qosient.com/argus/"
-SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz"
+SRC_URI="http://qosient.com/argus/dev/${P/_rc*}.rc.${PV/*_rc}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug ft geoip mysql sasl tcpd"
 
+S=${WORKDIR}/${P/_rc*}.rc.${PV/*_rc}
+
 MY_CDEPEND="
 	net-analyzer/rrdtool[perl]
 	net-libs/libpcap
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch
deleted file mode 100644
index 955c773f0107..000000000000
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.7.18-sasl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/common/argus_auth.c
-+++ b/common/argus_auth.c
-@@ -127,7 +127,7 @@
- static int RaSimple(void *context, int, const char **, unsigned *);
- static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
- 
--int ArgusInitializeAuthentication (struct ArgusInput *input, sasl_conn_t *)
-+int RaSaslNegotiate (struct ArgusInput *input);
- int RaGetSaslString (int, char *, int);
- int RaSendSaslString (int, const char *, int, int);
- 
-@@ -433,7 +433,7 @@
-    int in, out, retn = 0;
-    sasl_conn_t *conn;
- 
--   conn = input->conn;
-+   conn = input->sasl_conn;
-    in  = input->in;
-    out = input->out;
-