Fixed wrong installation path for man pages (bug #246661) and not respecting C{,XX}FLAGS (bug #240858), thank Diego Pettenò for both. General ebuild cleanup, fixed build with --as-needed and now we respect LDFLAGS.

(Portage version: 2.2_rc14/cvs/Linux 2.6.26-openvz.git-35f41f1 i686)

4 files changed, 101 insertions, 27 deletions

diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index 5de464f0e0cc..8715d9bff6db 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/nb
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.6 2007/09/06 17:33:08 jokey Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.7 2008/11/16 20:28:46 pva Exp $
+
+*nb-0.6.5-r1 (16 Nov 2008)
+
+  16 Nov 2008; Peter Volkov <pva@gentoo.org>
+  +files/nb-0.6.5-CFLAGS-as-needed.patch, -nb-0.6.5.ebuild,
+  +nb-0.6.5-r1.ebuild:
+  Fixed wrong installation path for man pages (bug #246661) and not
+  respecting C{,XX}FLAGS (bug #240858), thank Diego Pettenò for both.
+  General ebuild cleanup, fixed build with --as-needed and now we respect
+  LDFLAGS.
 
   06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nb-0.6.2.ebuild:
   Cleanup
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
new file mode 100644
index 000000000000..8ee4b5195047
--- /dev/null
+++ b/net-analyzer/nb/files/nb-0.6.5-CFLAGS-as-needed.patch
@@ -0,0 +1,59 @@
+=== 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
new file mode 100644
index 000000000000..038ce2ba66cd
--- /dev/null
+++ b/net-analyzer/nb/nb-0.6.5-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 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.1 2008/11/16 20:28:46 pva 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"
+
+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.6.5.ebuild b/net-analyzer/nb/nb-0.6.5.ebuild
deleted file mode 100644
index b475e1b3add9..000000000000
--- a/net-analyzer/nb/nb-0.6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.2 2006/10/08 22:01:16 jokey Exp $
-
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
-HOMEPAGE="http://www.nodebrain.org/"
-SRC_URI="mirror://sourceforge/nodebrain/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	./build-nb || die "build failed"
-}
-
-src_install() {
-	DIR=${D}/usr ./install-nb || die "install failed"
-
-        dodoc AUTHORS NEWS README THANKS sample/*
-        dohtml html/*
-}