Version bump.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 87 insertions, 66 deletions

diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index 55526aca3eeb..2a12e49b0d45 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nb
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.16 2012/11/18 18:41:25 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.17 2013/03/09 18:19:41 jer Exp $
+
+*nb-0.8.14 (09 Mar 2013)
+
+  09 Mar 2013; Jeroen Roovers <jer@gentoo.org> -nb-0.8.3.ebuild,
+  -files/nb-0.8.3-configure.patch, +nb-0.8.14.ebuild,
+  +files/nb-0.8.14-configure.patch, +files/nb-0.8.14-include.patch:
+  Version bump.
 
   18 Nov 2012; Agostino Sarubbo <ago@gentoo.org> nb-0.8.3.ebuild:
   Add ~amd64
diff --git a/net-analyzer/nb/Manifest b/net-analyzer/nb/Manifest
index 4ed1fe623067..f5c809637bee 100644
--- a/net-analyzer/nb/Manifest
+++ b/net-analyzer/nb/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nb-0.6.5-CFLAGS-as-needed.patch 2926 SHA256 f87bfd6777ebb15c77b375c106659841d7343279b4caeab6ba0ab5c4850f5f26 SHA512 41066876f6109bef377fbe43368d134d7da44e8c8d1a9f267d22eed8c4715be01eefdf0e96ab82da33b92ceab8a4f56cfb4bf41d68f8a399a1f3130b6eaa7d47 WHIRLPOOL 65560bf2930f2d9dcd5510734ad407921c140ee9d72b14f88ec61d753e0a6e9db1277573d1021d080d571445c28c4e4aa5dbcce94cd899b51cf0f15680cf2c88
-AUX nb-0.8.3-configure.patch 2425 SHA256 08893539eff48a21f1190a298e7d2755fcf8f4e7d8abb35f87c764211e4de149 SHA512 beda6a1dca88ecd29e505aaee1c989fdfec118b53c3af5deb230bc20a7ac5222793a2e6614d31b6420d7df26ee2ec20924a0d766bc7a347f139b153eef7bed40 WHIRLPOOL acedb8b68637004228d774216f16a6fe1912b5f44d2d363f5e70c73abebf73b8a9573b866ca2d556bd9f23df5f17d9223d103a9b5d80905b28c1b1adac3ea36a
+AUX nb-0.8.14-configure.patch 1159 SHA256 b0f447d4c7675959dcdac3c24cf14219f495c4025736f7424ca069c710f35eb2 SHA512 f3f64050f5d47be7aaed5ba2ab3aeabbd7a906646f99e13892dfd49ddd40f0f58023b10049708675f96fc9b3d8b45a5bf9f796342c55e21f04bce590058c5ed2 WHIRLPOOL 2056027aa421e775db496db467e8ce9293b09e1bc78846d53e9444cfffa53f4d6b8639791b00ec0afbbb5e184dbc44a6f14f5fd0b531c2f467eb1d7f91eb9478
+AUX nb-0.8.14-include.patch 691 SHA256 8fced6a07f0cdba5cf23da24e84f89d4d40741e7be26fed36efd46cbe16ec043 SHA512 406b57b9d9dd8b203c9b4b1303732c31fbd960624dd6f11a858e805ff0e1c48a251ba6f69dedf521a0ebf7bbd4ea3bba35f457b4d066aebe91942309852b2b4b WHIRLPOOL 80d91e9309bfe487137411bbfe8c078fcecbb691396cf8c9eccdb076d5013ed29dfe7a0feecd46639e2db70b625bfdc3b6e11d0e14e6ecf28e2fe66ae8984449
 DIST nb-0.6.5-source.tar.gz 558732 SHA256 fb8e0de88cd87dee81b6952d613b7010acecae35fc94a353198efc9cd5da9048
-DIST nodebrain-0.8.3.tar.gz 2014100 SHA256 2bef6bef34ad458373cfc63ec95fc351682ad1b14e4d93e918f506d6f4a94586 SHA512 5d19c1483b0ef7f786f25b85a3d7bd8fa32e9d31f90f64112ffa5a2bb34a44467c5951e71ffea732b4a4e963128dcd14cd50e20ed0ce574b96d7d705a8297420 WHIRLPOOL b5cb34cf148a6a1a204bb54d2c3c0497f7956a0e9b38a0df390349776687b3eb3366756da273b362f710a58b25073daad6350b182297d737571196028f4b4cad
+DIST nodebrain-0.8.14.tar.gz 2081431 SHA256 f85d90e15a04cc77286027ba8a95764dfd6195343337dda43829a1b6e7caaea2 SHA512 1e863531e970611186caf5a6847535a6f11890b59ca9c91bfc78827e1e1c4d425b5e63244e9b527fa417ee7b34b29e920a7df14a85dc5d9c78a06f73d5437d66 WHIRLPOOL 8596dca2fcfcf8ea7085cfa6d39025ef8ed0536898db7a5192d4b92694b9f459b4714d9e911fc7e2e1415791e6c146012b86bbc2fc25d5fbc13a234a6fff9305
 EBUILD nb-0.6.5-r1.ebuild 829 SHA256 55c7ef16f1e92f1240cc12903767098b3ed50a4feffdb4ca7d6c3018f4549192 SHA512 bd5cccae63faec6b2721c049b3997d3e7f6d0580d8d9faebc40158249093767f4e42284e2d6bcf19cc97b38273b341ff7e9e94e940452aa57325e649a88db858 WHIRLPOOL b36dcf47b498cfd8b1385c3188120ebe82dacf8f8482a52446255efc405518b0c988223c6501255dca5e8e96f5f8b5f17072525cae8f5f091b5553bf7d2d5148
-EBUILD nb-0.8.3.ebuild 1163 SHA256 01aec045d72ab79f9890f1bcedd07fbc93e0fd478e2ea6b3619f1dd6d2ff44d6 SHA512 fa36d086289b04f59c81b9c7ee1e7030cccd0d8985fc44c5e1d1aaf9710d06ae64b67a4bcce765069c15c73b07ecf55ce16fe3ecb50a80520637847c0ef9006b WHIRLPOOL 94e2d2e60f39b9aabefdb2636830115c2e65a83b173ba4347793865067b87325e6106a31e5cf4a9c0df6d4277bb3cdab27cfa66ced1bc3d1f53f2cff61abcc4f
-MISC ChangeLog 2552 SHA256 be59ee371ae6768c56e4f95653bae658ca18823ac03b02fcc7889b2acefe2265 SHA512 10f05ed34789789f472a489a37e74cc1fc768a7c86256638f80e8f74c305a6896b6a20376810f372d1fd8b40e1da8ed048851c0f0bb365308d232522b7da3ca5 WHIRLPOOL f5effb1ee351ed3818bd810ca26952eefca7b699d4debad60807a54c219277a5bff1875ef75335350ae1b39dba5fb8ed1e33ec4f5623ac02781edac64c3db785
+EBUILD nb-0.8.14.ebuild 1257 SHA256 a1a358cb7a2974a4f0eba2f4a6bdafd48cb2058a471df484343be05e540fb1b4 SHA512 d437077c583df1f75713f2ba3a6e16af3b8635b228be947895da4d16b2b52a3aced8812eb3a27a3b9b8f084251d87ab4c21bbd6ca80bf8af5481a9d537487366 WHIRLPOOL 5a9c9137fb65834518c6e2faf30161edf16dd4a4bbe40eb9e780e672f685e4562a8b7919692e2c26076c7bc9352ed6da0664b81000979d0cbbbe53577355e731
+MISC ChangeLog 2782 SHA256 6cfc2d75878f4d6c868d0943653fcb061b1c3de4dd708aad2e2b98ac3a15b5a2 SHA512 0fa300ec9e88bcbe7645c37f54bc4c1238679784c0d61079590b983f8adb2918736c9a53d1e5d3a1a88ef10aa62e85dfd193bed58b519b60ec6332d801d273be WHIRLPOOL 24798e87306c7de110e3fd3cb84cbd42cb077b6c4a052e2d07a5b1e099ab0395eb1db73a8bd953b6014f173f5b73a6e5609fac940839ca7bb767146b4ef3939a
 MISC metadata.xml 251 SHA256 0d8b4ea8ec9e2906498a9f4b20f1403c0c8435082d3b357d42040eddeaf1ed29 SHA512 1f4fc69d9af91cc0714177fd6915168ecefcde9d9f1c191513b8179f0d98389b990dc221d385641f1c1af6864cce6c71be97fa9dba644a0dbc0135358380236b WHIRLPOOL f7924cb8152af743f3d66a79015214adeca6852bd62099c5ce847caae3e730b592d4b993d9f235b907d8d1d3451ec3040bf41c8fac284c02605d8e95bfedd359
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlE7fT4ACgkQVWmRsqeSphO/PgCfVBn0uM7WkXXmlaXTUvW8TZMH
+vFkAnRrdBI/6AoAexzVa1qhD1Pw5wijM
+=/1r9
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nb/files/nb-0.8.14-configure.patch b/net-analyzer/nb/files/nb-0.8.14-configure.patch
new file mode 100644
index 000000000000..3b0793a90190
--- /dev/null
+++ b/net-analyzer/nb/files/nb-0.8.14-configure.patch
@@ -0,0 +1,15 @@
+--- a/lib/configure.ac
++++ b/lib/configure.ac
+@@ -130,10 +130,10 @@
+ AC_CHECK_LIB(readline,readline,,[AC_MSG_ERROR(Required library -lreadline not found. Specify path in LDFLAGS.)])
+ AC_CHECK_LIB(history,add_history,,[AC_MSG_ERROR(Required library -lhistory not found. Specify path in LDFLAGS.)])
+ #AC_CHECK_LIB(ssl,SSL_library_init,,[AC_MSG_ERROR(Required library -lssl not found. Specify path in LDFLAGS.)])
+-AC_SEARCH_LIBS(SSL_library_init,ssl)
++#AC_SEARCH_LIBS(SSL_library_init,ssl)
+ AC_SEARCH_LIBS(X509_get_subject_name,crypto)
+ #PKG_CHECK_MODULES(libssl,openssl)
+-#PKG_CHECK_MODULES([libssl],[openssl],[LIBS="$LIBS `$PKG_CONFIG --cflags --libs openssl`"],[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include in LDFLAGS or LD_LIBRARY_PATH to support this build.)])
++PKG_CHECK_MODULES(libssl,openssl,[LIBS="$LIBS $libssl_LIBS"],[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include in LDFLAGS or LD_LIBRARY_PATH to support this build.)])
+ 
+ AC_SEARCH_LIBS(socket,socket)
+ AC_SEARCH_LIBS(inet_ntoa,nsl)
diff --git a/net-analyzer/nb/files/nb-0.8.14-include.patch b/net-analyzer/nb/files/nb-0.8.14-include.patch
new file mode 100644
index 000000000000..c34965bfe5e5
--- /dev/null
+++ b/net-analyzer/nb/files/nb-0.8.14-include.patch
@@ -0,0 +1,30 @@
+--- a/lib/nbbfi.c
++++ b/lib/nbbfi.c
+@@ -197,6 +197,7 @@
+ *=============================================================================
+ */
+ #include <nb/nbi.h>
++#include <ctype.h> /* isdigit() */
+ 
+ /**************************************************************************
+ * Index Routines
+--- a/lib/nbkit.c
++++ b/lib/nbkit.c
+@@ -51,6 +51,7 @@
+ #include <pwd.h>
+ #include <errno.h>
+ #include <unistd.h>
++#include <stdlib.h> /* system() */
+ 
+ static int nbKitUsage(void){
+     printf("Usage:\n");
+--- a/module/webster/nb_webster.c
++++ b/module/webster/nb_webster.c
+@@ -78,6 +78,7 @@
+ */
+ #include "config.h"
+ #include <nb/nb.h>
++#include <ctype.h> /* isalnum() */
+ 
+ #if defined(WIN32)
+ 
diff --git a/net-analyzer/nb/files/nb-0.8.3-configure.patch b/net-analyzer/nb/files/nb-0.8.3-configure.patch
deleted file mode 100644
index 645c80d0279b..000000000000
--- a/net-analyzer/nb/files/nb-0.8.3-configure.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-1) Use pkg-config to figure out openssl libraries (also fixes underlinking with
-   ld.gold, bug #371893).
-2) Respect CFLAGS/LDFLAGS.
-
--jer
-
-
---- a/lib/configure.ac
-+++ b/lib/configure.ac
-@@ -113,7 +113,7 @@
- AC_CHECK_LIB([pcre],[pcre_compile],,[AC_MSG_ERROR(Required library -lpcre not found. You may want to download it from http://www.pcre.org or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
- AC_CHECK_LIB([readline],[readline],,[AC_MSG_ERROR(Required library -lreadline not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
- AC_CHECK_LIB(history,add_history,,[AC_MSG_ERROR(Required library -lhistory not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
--AC_CHECK_LIB(ssl,SSL_library_init,,[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
-+PKG_CHECK_MODULES(libssl,openssl,LIBS="$LIBS `$PKG_CONFIG --cflags --libs openssl`",[AC_MSG_ERROR(Required library -lssl not found. You may want to download it from http://www.openssl.org/ or locate it and include directory in LD_LIBRARY_PATH to support this build.)])
- 
- AC_SEARCH_LIBS(socket,socket)
- AC_SEARCH_LIBS(inet_ntoa,nsl)
-@@ -152,8 +152,6 @@
- # define a release date variable
- AC_DEFINE_UNQUOTED(NB_COMPILE_PLATFORM,"$host",[Define compile platform])
- 
--CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include"
--LDFLAGS="-L/usr/local/ssl/lib"
- case "$host" in
-   *-netbsd*)
-     AC_DEFINE(NETBSD,,[Define if NetBSD])
---- a/module/configure.ac
-+++ b/module/configure.ac
-@@ -100,8 +100,6 @@
- 
- AC_SUBST([NB_MOD_PATH],[../.libs])
- 
--CFLAGS="-Wall -I/usr/local/include -I/usr/local/ssl/include"
--LDFLAGS="-L/usr/local/ssl/lib"
- 
- #=====================================
- # Checks for header files.
---- a/module/webster/configure.ac
-+++ b/module/webster/configure.ac
-@@ -87,8 +87,6 @@
- #  AC_PATH_PROGS([NB],[nb-0.7.5 nb-0.7.4 nb-0.7.3 nb-0.7.2 nb-0.7.1 nb])
- #fi
- 
--CFLAGS="-I/usr/local/include -I/usr/local/ssl/include"
--LDFLAGS="-L/usr/local/ssl/lib"
- 
- #=====================================
- # Checks for libraries.
diff --git a/net-analyzer/nb/nb-0.8.3.ebuild b/net-analyzer/nb/nb-0.8.14.ebuild
index 7056bbeb2fc0..2f760880f61e 100644
--- a/net-analyzer/nb/nb-0.8.3.ebuild
+++ b/net-analyzer/nb/nb-0.8.14.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.3.ebuild,v 1.8 2012/11/18 18:41:25 ago Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.8.14.ebuild,v 1.1 2013/03/09 18:19:41 jer Exp $
 
+EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
@@ -28,26 +27,34 @@ RDEPEND="
 S="${WORKDIR}/nodebrain-${PV}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-
 	# fdl.texi is not included in the sources
-	sed -i doc/nbTutorial/nbTutorial.texi -e '/@include fdl.texi/d' || die
+	sed -i \
+		-e '/@include fdl.texi/d' \
+		doc/nbTutorial/nbTutorial.texi || die
+
+for file in $(find . -name configure.ac); do
+	cp -av $file{,.org}
+done
+	epatch "${FILESDIR}"/${PN}-0.8.14-include.patch
+	epatch "${FILESDIR}"/${PN}-0.8.14-configure.patch
 
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static) --include=/usr/include
+	econf \
+		$(use_enable static-libs static) \
+		--include=/usr/include
 }
 
 src_compile() {
 	# Fails at parallel make
-	emake -j1 || die
+	emake -j1
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	use static-libs || find "${D}" -name '*.la' -delete
+	default
+	use static-libs || prune_libtool_files
 	dodoc AUTHORS NEWS README THANKS sample/*
 	dohtml html/*
 }