Version bump.

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

5 files changed, 67 insertions, 98 deletions

diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index 1dd31f107d3b..dd8c2d2f6c7b 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nb
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.18 2013/03/09 18:23:17 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.19 2014/05/03 21:30:16 jer Exp $
+
+*nb-0.8.16 (03 May 2014)
+
+  03 May 2014; Jeroen Roovers <jer@gentoo.org> -nb-0.6.5-r1.ebuild,
+  nb-0.8.14.ebuild, +nb-0.8.16.ebuild, -files/nb-0.6.5-CFLAGS-as-needed.patch:
+  Version bump.
 
   09 Mar 2013; Jeroen Roovers <jer@gentoo.org> nb-0.8.14.ebuild:
   Remove testing cruft.
diff --git a/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch b/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch
deleted file mode 100644
index 8ee4b5195047..000000000000
--- a/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-=== modified file 'Makefile.am'
---- Makefile.am	2008-11-16 20:06:01 +0000
-+++ Makefile.am	2008-11-16 20:20:44 +0000
-@@ -74,23 +74,23 @@
- # to depend on the nb executable use "nb${EXEEXT}"
- 
- nb_mod_simple.${NB_MOD_SUFFIX}: nbapi.h nb_mod_simple.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_simple.c -o nb_mod_simple.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_simple.c -o nb_mod_simple.${NB_MOD_SUFFIX}
- nb_mod_tree.${NB_MOD_SUFFIX}: nbapi.h nb_mod_tree.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_tree.c -o nb_mod_tree.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_tree.c -o nb_mod_tree.${NB_MOD_SUFFIX}
- nb_mod_console.${NB_MOD_SUFFIX}: nb${EXEEXT} nb.h nb_mod_console.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_console.c -o nb_mod_console.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_console.c -o nb_mod_console.${NB_MOD_SUFFIX}
- nb_mod_netflow.${NB_MOD_SUFFIX}: nbapi.h nb_mod_netflow.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_netflow.c -o nb_mod_netflow.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_netflow.c -o nb_mod_netflow.${NB_MOD_SUFFIX}
- nb_mod_snmptrap.${NB_MOD_SUFFIX}: nbapi.h nb_mod_snmptrap.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_snmptrap.c -o nb_mod_snmptrap.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_snmptrap.c -o nb_mod_snmptrap.${NB_MOD_SUFFIX}
- nb_mod_syslog.${NB_MOD_SUFFIX}: nbapi.h nb_mod_syslog.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_syslog.c -o nb_mod_syslog.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_syslog.c -o nb_mod_syslog.${NB_MOD_SUFFIX}
- nb_mod_translate.${NB_MOD_SUFFIX}: nbapi.h nb_mod_translate.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_translate.c -o nb_mod_translate.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_translate.c -o nb_mod_translate.${NB_MOD_SUFFIX}
- nb_mod_cache.${NB_MOD_SUFFIX}: nb${EXEEXT} nb.h nb_mod_cache.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_cache.c -o nb_mod_cache.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_cache.c -o nb_mod_cache.${NB_MOD_SUFFIX}
- nb_mod_servant.${NB_MOD_SUFFIX}: nb${EXEEXT} nbapi.h nb_mod_servant.c
--	${CC} ${NB_MOD_CFLAGS} nb_mod_servant.c -o nb_mod_servant.${NB_MOD_SUFFIX}
-+	${CC} $(CFLAGS) ${NB_MOD_CFLAGS} $(LDFLAGS) nb_mod_servant.c -o nb_mod_servant.${NB_MOD_SUFFIX}
- 
- # CLEANFILES = bin/nb_mod_<module>.${NB_MOD_SUFFIX}
- 
-
-=== modified file 'configure.ac'
---- configure.ac	2008-11-16 20:06:01 +0000
-+++ configure.ac	2008-11-16 20:13:16 +0000
-@@ -117,7 +117,6 @@
- NB_MOD_PATH="/usr/local/lib/${PACKAGE_NAME}"
- NB_MOD_PATH_SEPARATOR=":"
- NB_MOD_SUFFIX="so"
--CFLAGS=
- case "$host" in
-   *-netbsd*)
-     AC_DEFINE(NETBSD,,[Define if NetBSD])
-@@ -144,7 +143,8 @@
-   *-linux*)
-     AC_DEFINE(LINUX,,[Define if LINUX])
-     CFLAGS="${CFLAGS} -rdynamic"
--    LDFLAGS="${LDFLAGS} -ldl -lm"
-+    LDFLAGS="${LDFLAGS}"
-+    LIBS=" -ldl -lm"
-     ;;
-   *-hpux*)
-     AC_DEFINE(HPUX,,[Define if HPUX])
-
diff --git a/net-analyzer/nb/nb-0.6.5-r1.ebuild b/net-analyzer/nb/nb-0.6.5-r1.ebuild
deleted file mode 100644
index ff27b793f822..000000000000
--- a/net-analyzer/nb/nb-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.6.5-r1.ebuild,v 1.3 2011/10/27 18:42:06 jer Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
-HOMEPAGE="http://nodebrain.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nodebrain/${P}-source.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="
-	!sys-boot/netboot
-	!www-apps/nanoblogger
-"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-CFLAGS-as-needed.patch"
-	eautoreconf
-}
-
-src_install() {
-	#DIR="${D}/usr" ./install-nb || die "install failed"
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README THANKS sample/*
-	dohtml html/*
-}
diff --git a/net-analyzer/nb/nb-0.8.14.ebuild b/net-analyzer/nb/nb-0.8.14.ebuild
index 85f3bab5fffa..e2e438e532d3 100644
--- a/net-analyzer/nb/nb-0.8.14.ebuild
+++ b/net-analyzer/nb/nb-0.8.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.14.ebuild,v 1.2 2013/03/09 18:23:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.14.ebuild,v 1.3 2014/05/03 21:30:16 jer Exp $
 
 EAPI=5
 inherit autotools eutils
 
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
+DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
 HOMEPAGE="http://nodebrain.sourceforge.net/"
 SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
 
diff --git a/net-analyzer/nb/nb-0.8.16.ebuild b/net-analyzer/nb/nb-0.8.16.ebuild
new file mode 100644
index 000000000000..fbc0f8899cdf
--- /dev/null
+++ b/net-analyzer/nb/nb-0.8.16.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.16.ebuild,v 1.1 2014/05/03 21:30:16 jer Exp $
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
+HOMEPAGE="http://nodebrain.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nodebrain/nodebrain-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs"
+
+DEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	sys-apps/texinfo
+"
+RDEPEND="
+	!sys-boot/netboot
+	!www-apps/nanoblogger
+"
+
+S="${WORKDIR}/nodebrain-${PV}"
+
+src_prepare() {
+	# fdl.texi is not included in the sources
+	sed -i \
+		-e '/@include fdl.texi/d' \
+		doc/nbTutorial/nbTutorial.texi || die
+
+	epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
+}
+
+src_compile() {
+	# Fails at parallel make
+	emake -j1
+}
+
+src_install() {
+	default
+	use static-libs || prune_libtool_files
+	dodoc AUTHORS NEWS README THANKS sample/*
+	dohtml html/*
+}