Remove fdl.texi sed script and parallel make restriction, by Ed Trettevik.

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

4 files changed, 12 insertions, 81 deletions

diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index 5c89d1f018a7..0eda75fe17f9 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.23 2014/12/17 07:21:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.24 2014/12/19 14:54:23 jer Exp $
+
+  19 Dec 2014; Jeroen Roovers <jer@gentoo.org> -nb-0.8.17.ebuild,
+  nb-0.9.03.ebuild:
+  Remove fdl.texi sed script and parallel make restriction, by Ed Trettevik.
 
 *nb-0.9.03 (17 Dec 2014)
 
diff --git a/net-analyzer/nb/Manifest b/net-analyzer/nb/Manifest
index e76824a32e83..7a9c26910933 100644
--- a/net-analyzer/nb/Manifest
+++ b/net-analyzer/nb/Manifest
@@ -2,18 +2,16 @@
 Hash: SHA256
 
 AUX nb-0.8.14-include.patch 691 SHA256 8fced6a07f0cdba5cf23da24e84f89d4d40741e7be26fed36efd46cbe16ec043 SHA512 406b57b9d9dd8b203c9b4b1303732c31fbd960624dd6f11a858e805ff0e1c48a251ba6f69dedf521a0ebf7bbd4ea3bba35f457b4d066aebe91942309852b2b4b WHIRLPOOL 80d91e9309bfe487137411bbfe8c078fcecbb691396cf8c9eccdb076d5013ed29dfe7a0feecd46639e2db70b625bfdc3b6e11d0e14e6ecf28e2fe66ae8984449
-DIST nodebrain-0.8.17.tar.gz 2362356 SHA256 5fe3ca1c49e85e3ccb0ec95765dd0b2f234072817f6bfadc0039993cbb9870cc SHA512 0e1daa504f473e36d276d025b856b2ca1aa104f684e3c8fb46239e47103b30eb8e053f7d6e7c9e4726d818e883bec06e29ecca7d6cd58baa07b12c42e67073e3 WHIRLPOOL 511569a0edce9659c979be5e93fa7a21782c026f458e224beb11c24db57c7bdfc8cd1f79f86b564d44bec41228ed2f09f8b3207f296cc7d4d14c4773b5c8e3ea
 DIST nodebrain-0.9.02.tar.gz 2421175 SHA256 986617d66cca72f01c325953a321e34f28cb80ed105d4ab0e8967e0a328fcf85 SHA512 08ed3e1bd8a8d49bca702ca3b8b1dd72ef9a4bb2dc7b495dd049b6927f4353af6599ad5f8c8135cc11f6ffc68355b79f8782ec0527af27248c755aeaceee51e7 WHIRLPOOL 5c72ebe99e6f7c85870516d6ff41bf700ac05375d4c8bae52b61870737374a4555632b5e7a1b11bfb3ae2ac33c2f44984d3feabc192437f95048a03a4901b558
 DIST nodebrain-0.9.03.tar.gz 2485735 SHA256 e9fce23525da8c6b3e553492b724eb2122faf22aed92ed45b15c6018eb643fef SHA512 bf81ef4be1518b72d8ef0cccf42747cfe2926ed6cecfde97c05c161c2f2d00525d07da2e24b1c05debb84fa6f35dca7d7dbbc3292471f41dd322ea80175fb96c WHIRLPOOL 0ae2c4f8085cbc725662ee758768a7684523350ebe59ab6f50f374c6b5d0b55588697f84bb395bf946eaa3546a052f08f4fa067532b42eafcf84a9a84baecd7c
-EBUILD nb-0.8.17.ebuild 1176 SHA256 2eaa7111530a841e1bbac82c7cf1e6e6b5c042c0ec26559867b24e62c3b4c8ed SHA512 3bf8763c8aa672da2e819f19bd89a712a2f6eac1f744c292d885bf5df6de4d035913b6146c8ec004fbda765e7225fa9888e90b3e0d660efd1fdb58cde27f4083 WHIRLPOOL 468e28efbba7664679185ba379ff603f03e3dcb4244c396ae51d10542a6d53f2281445a4bb4a47903fdef0ee29d291bd792fe9d82b492ad647c690d0cc701527
 EBUILD nb-0.9.02.ebuild 1176 SHA256 5e2ef255e608f06edd0a67c81047af61e52750c1cc0b2a939d332e921d7bac1e SHA512 a1c1aabdd050d90db46fdba5db04de0d8a74d49a1238e00f73a7344e6ad5c96b170d47be803848a07f168b660b0278a6dbdea0e05d43e20ca3fe430c23708a0e WHIRLPOOL 4d10f8ce6a8015c1db5236b4c2e3ea4225bc2c3cbc616c7ddb24f935fd3ba99cbcc1346da4d4c36a4baebe88145911c5d4e164765e561f301bb67ddec1be2a9d
-EBUILD nb-0.9.03.ebuild 1176 SHA256 f9c5f73278efb228aa624c92d9ebb2f1a37cccd4995f03034ca3af2a8a5123e6 SHA512 fb0ddf92d8a64a4995d15bf2d905529ad3839cfde9f2f39d6f0c605e855df10ca080d4729b4ede0890a09f9e66442f9630c9b98e906181509be4d425b905ea12 WHIRLPOOL 4b41c6c2582606ee014aca0763e5ffe77371170c4b71fee234e21ff1fb14563266c2e1b1dcf8dd93be74976354697c34e9c8268712464cf5781720b883a1db98
-MISC ChangeLog 3589 SHA256 846bb4e8727318e0298dc27a0eedf7a74e4725133c7fc246d915f435ef368c42 SHA512 0c59e2d1534782d48914abf051ac6d6a0904414640bd51f3dc4a02c3928ef9987530a544826529933a6e82c5aeaf2be6e505602212bf08305e32b3c00e136c59 WHIRLPOOL be5e63dc0a27df50613a7ae508949160504250c51e79a501918b258debc7e1febdf92a07cddaa2b9bbb668eac27cb4ba896b3c2c6c9b7484df05a14aefac400e
+EBUILD nb-0.9.03.ebuild 972 SHA256 c306204ad265d252a7c43a308ea3dcef4dba476d81cbbf0d76f8fcc04d397d6f SHA512 8775aa78c2e6bd58e8f09635a3afa6dce884db4f94ed06219b3d961b2e32663055e44162216446160ed0c7595b81ee70d4605a92ccef48d4c74aec8709d250c4 WHIRLPOOL e35f08136f2ebdb02007c4fc54478bfbace1b2041fb46771249e61c73a9b2ae03cfc9d13b6bc01756f838aa39911dbd2420c24c539562dff1c676b761e58821d
+MISC ChangeLog 3753 SHA256 002d94b3239410aba1776825c28f7b041abfcb3d1cf33afa5009004713075e15 SHA512 4bce91d6cc695147739518cc40845d5a7eace4f3a8b742d58e46f7ecdd2da2f7ac22f689a34279e4fccbfad7fa88f4320b2e55caf584d6c8f3518fa7165af536 WHIRLPOOL 05bd017d3f9a313e6f3e1c7e0038cdb1f65379d2e0e912b8a390605ec8ff3c812a37bebe2411a63969d6e0e07fe2376fab74b586cc17d10ea22d76cf148d7909
 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSRLuQACgkQVWmRsqeSphPC5QCeISAgz+Nedvqxs/03XJYgYrK3
-p7gAn3zU4YwIArHD876UXO3KicuFw7YK
-=iYBD
+iEYEAREIAAYFAlSUPCAACgkQVWmRsqeSphPKLQCeIujceuvrIUCZJb1VsYPyaLIU
+rwkAn1QcHMbKHXbJMJI6E4flakShzOsw
+=INx6
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nb/nb-0.8.17.ebuild b/net-analyzer/nb/nb-0.8.17.ebuild
deleted file mode 100644
index 352a77d6c9b4..000000000000
--- a/net-analyzer/nb/nb-0.8.17.ebuild
+++ /dev/null
@@ -1,59 +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/nb/nb-0.8.17.ebuild,v 1.2 2014/08/15 09:04:47 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="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="static-libs"
-
-CDEPEND="dev-libs/libedit"
-DEPEND="
-	${CDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-RDEPEND="
-	${CDEPEND}
-	!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/*
-}
diff --git a/net-analyzer/nb/nb-0.9.03.ebuild b/net-analyzer/nb/nb-0.9.03.ebuild
index 3caf3ea813b9..4cc306d73c1c 100644
--- a/net-analyzer/nb/nb-0.9.03.ebuild
+++ b/net-analyzer/nb/nb-0.9.03.ebuild
@@ -1,9 +1,9 @@
 # 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.9.03.ebuild,v 1.1 2014/12/17 07:21:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.9.03.ebuild,v 1.2 2014/12/19 14:54:23 jer Exp $
 
 EAPI=5
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="Nodebrain is a tool to monitor and do event correlation"
 HOMEPAGE="http://nodebrain.sourceforge.net/"
@@ -30,14 +30,7 @@ RDEPEND="
 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() {
@@ -46,11 +39,6 @@ src_configure() {
 		--include=/usr/include
 }
 
-src_compile() {
-	# Fails at parallel make
-	emake -j1
-}
-
 src_install() {
 	default
 	use static-libs || prune_libtool_files