Fixing parallel make issue wrt bug #153249 and small cleanup

(Portage version: 2.1.2_rc1-r1)
 (Signed Manifest commit)

3 files changed, 29 insertions, 110 deletions

diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index 2150ba023fd9..1f2a2a4cc09a 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,33 +1,47 @@
-MD5 d865c48ba0df09ade08b22c44d8aef53 ChangeLog 4338
-RMD160 474b99f16f6a586e0bbd71cf1e4185a4c4d542fd ChangeLog 4338
-SHA256 844f5bcbc263ad437bc523f79a371dfdc88fa3772093d8b93f9964de60f81925 ChangeLog 4338
-MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31 65
-RMD160 70842c46004bd24d1bab88d59c4845dd2dd25f1d files/digest-ipac-ng-1.31 65
-SHA256 b634bf1be827660797d855548fbf7057e42c4b15248bb3c9026fd00b50edd40c files/digest-ipac-ng-1.31 65
-MD5 cf28be07b888339fa241bd198daa38d9 files/digest-ipac-ng-1.31-r2 137
-RMD160 ee19f98021b4b9ff9603eef71ac46104694a50ec files/digest-ipac-ng-1.31-r2 137
-SHA256 fce44f31a09e3b1ca92674d48f92b41b1d884377e47d5e913cdfe14fa7b6617e files/digest-ipac-ng-1.31-r2 137
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ipac-ng-1.31-iptables.patch 389 RMD160 fd15e78a6e0f8477fb2f4a4e82a55e32777a8d4e SHA1 a4e1a11b7660b7012750089834fe225922386fad SHA256 3b4454f56388652805a511787486ece70cc1589e65a87415e5d3cb622b0caf78
 MD5 b2016c3272e9dd9c2b48238bb07efa3a files/ipac-ng-1.31-iptables.patch 389
 RMD160 fd15e78a6e0f8477fb2f4a4e82a55e32777a8d4e files/ipac-ng-1.31-iptables.patch 389
 SHA256 3b4454f56388652805a511787486ece70cc1589e65a87415e5d3cb622b0caf78 files/ipac-ng-1.31-iptables.patch 389
+AUX ipac-ng.cron.1.30 216 RMD160 a34013742e76d77d0ca5cab75d96ead99ac04ae7 SHA1 e3cee763184634203e2dc68fcc499b8b24bd2e92 SHA256 fe741234fcc84fa9823ebc000bf7cab952b906dbbb9206432398b21569e580ec
 MD5 72162ed7957cc82168b4870d26cf66fe files/ipac-ng.cron.1.30 216
 RMD160 a34013742e76d77d0ca5cab75d96ead99ac04ae7 files/ipac-ng.cron.1.30 216
 SHA256 fe741234fcc84fa9823ebc000bf7cab952b906dbbb9206432398b21569e580ec files/ipac-ng.cron.1.30 216
+AUX ipac-ng.rc.1.30 897 RMD160 6f8afec9d8a3a8065578a95152e5d6d931d5cc71 SHA1 87d4caf973f7f62bbe42dd908c3f8d1df82d7562 SHA256 6db10bc0c47267f79ac0fe438a45296e766b4c41b284f2dda7b850dc61eb9832
 MD5 983ee78164ba492b7bc558418adb0739 files/ipac-ng.rc.1.30 897
 RMD160 6f8afec9d8a3a8065578a95152e5d6d931d5cc71 files/ipac-ng.rc.1.30 897
 SHA256 6db10bc0c47267f79ac0fe438a45296e766b4c41b284f2dda7b850dc61eb9832 files/ipac-ng.rc.1.30 897
+AUX ipac.conf.1.30 1820 RMD160 513e3e2d9bd9f9e281b68f3a27c717bbb0fe213a SHA1 a415aa4ccba62333b4942d08c21ab5f54b42140c SHA256 162c7e44c9c39341b0c8b1982cc190985c40441164fd7abd48b5e7318f8b05d6
 MD5 aff4fe032f6693f676350c45e7e78261 files/ipac.conf.1.30 1820
 RMD160 513e3e2d9bd9f9e281b68f3a27c717bbb0fe213a files/ipac.conf.1.30 1820
 SHA256 162c7e44c9c39341b0c8b1982cc190985c40441164fd7abd48b5e7318f8b05d6 files/ipac.conf.1.30 1820
+AUX rules.conf.1.30 1046 RMD160 a1dffd63f1bcc8e2427775182f56b2bdfc69a869 SHA1 6d97977481aa45f845bf97085a8e6228359a8532 SHA256 714cea1d01128c630c9a53110188877ea3a77b028fb12900b6252e793cdaee5b
 MD5 dba879e7b8ccdcae27d64ceb4ba54f9b files/rules.conf.1.30 1046
 RMD160 a1dffd63f1bcc8e2427775182f56b2bdfc69a869 files/rules.conf.1.30 1046
 SHA256 714cea1d01128c630c9a53110188877ea3a77b028fb12900b6252e793cdaee5b files/rules.conf.1.30 1046
-MD5 be33fd38163698d5171a86ef64d9b974 ipac-ng-1.31-r2.ebuild 2792
-RMD160 bfad149bbdbeccd1c8729c35f1cf9db5dfc27f47 ipac-ng-1.31-r2.ebuild 2792
-SHA256 ac566675f4ce2649f91c1d92d9c77efc0a1b77a88c8f63b340744ebea9479546 ipac-ng-1.31-r2.ebuild 2792
-MD5 e5d20765be7eafab113f6e916faad3c3 ipac-ng-1.31.ebuild 2573
-RMD160 e2d9ff084ee308535e6b6f2ae7d753e675736083 ipac-ng-1.31.ebuild 2573
-SHA256 8a65b437fd57bc44737a0e03e2b70e99f6cbe9b121419d3fffe1e30a1ca164f7 ipac-ng-1.31.ebuild 2573
+DIST ipac-ng-1.31-patches.tar.bz2 26731 RMD160 cf98e61056791f662e8f0b33f9aeee48137080dc SHA1 e0bf56f03df583aea0eb3eb2a3e5729163d9a60a SHA256 a836e32544b02eb8eb545e0b79a6739ed62911cfbdd02af46662bf0b40e22f94
+DIST ipac-ng-1.31.tar.bz2 162843 RMD160 ddab09b9136d59fe74e9aafbc1278cce2b1622d1 SHA1 a69656d328616d1c6233ce2d94fbc94ddfbeba9c SHA256 333e09c8075b576d681932f48158f44419113b64081b110c7377499e02ceb7cd
+EBUILD ipac-ng-1.31-r2.ebuild 2725 RMD160 1fdabce861d04e5140897e3b1948475fb0512aac SHA1 e07466477bc39907916a2c2d4079b3592b96ecfd SHA256 3193894b859a2fd8e25ca6696b223553979a33e32319a7670469d239b554ea02
+MD5 8f407ecb18a7d70aff9a993da23c5d91 ipac-ng-1.31-r2.ebuild 2725
+RMD160 1fdabce861d04e5140897e3b1948475fb0512aac ipac-ng-1.31-r2.ebuild 2725
+SHA256 3193894b859a2fd8e25ca6696b223553979a33e32319a7670469d239b554ea02 ipac-ng-1.31-r2.ebuild 2725
+MISC ChangeLog 4494 RMD160 aa09f32c86a505c5366b12947b94c8d38453ef9c SHA1 ce559a300a9562a19670b0f1cd59c477bbed84c4 SHA256 916508d195b5009386951d4dbffcfd1b41afcd624310d9842fae6bd0feddba34
+MD5 6d31e5e4e0ec290ee7678efd02156e6c ChangeLog 4494
+RMD160 aa09f32c86a505c5366b12947b94c8d38453ef9c ChangeLog 4494
+SHA256 916508d195b5009386951d4dbffcfd1b41afcd624310d9842fae6bd0feddba34 ChangeLog 4494
+MISC metadata.xml 286 RMD160 92f59ba848186619ed6753f6cbbfd8deb3052092 SHA1 f04be974c4bf21f3dad4a34abb3ef205726715ae SHA256 b68c20680aaf86f9886146aad86f532a115427854196c394aebf96725aa660a3
 MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
 RMD160 92f59ba848186619ed6753f6cbbfd8deb3052092 metadata.xml 286
 SHA256 b68c20680aaf86f9886146aad86f532a115427854196c394aebf96725aa660a3 metadata.xml 286
+MD5 d7d29422713d40031797d3245e3b596a files/digest-ipac-ng-1.31-r2 503
+RMD160 6c6429ee3c39655d610af70f78fddcd35fb25755 files/digest-ipac-ng-1.31-r2 503
+SHA256 cf3b6286348a6ac32f28a2f5b967f508a6e8f9228ad754b0ecd5f61c2ff6b7d9 files/digest-ipac-ng-1.31-r2 503
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD4DBQFFSK4fz974XjDVpbkRAmGEAKDDyTToadCMslj/i+j20BZT2ZhTEACXbR52
+Aa6J/17SOhD/EaQCn4rPYA==
+=Y3Iy
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31 b/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31
deleted file mode 100644
index b1c81b970e22..000000000000
--- a/net-analyzer/ipac-ng/files/digest-ipac-ng-1.31
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f9ed8a729145ae613b3cdc518f1750e3 ipac-ng-1.31.tar.bz2 162843
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
deleted file mode 100644
index 3080d8fc4ca7..000000000000
--- a/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild,v 1.4 2005/07/29 23:49:18 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
-HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
-SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gd sqlite"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex
-	dev-lang/perl
-	gd? ( dev-perl/GD )
-	sqlite? ( =dev-db/sqlite-2* )
-	!sqlite? ( sys-libs/gdbm )
-	sys-devel/flex
-	virtual/libc"
-RDEPEND="net-firewall/iptables
-	virtual/cron
-	dev-lang/perl
-	gd? ( dev-perl/GD )
-	sqlite? ( =dev-db/sqlite-2* )
-	!sqlite? ( sys-libs/gdbm )
-	virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-iptables.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use sqlite; then
-		myconf="--enable-default-storage=sqlite";
-	else
-		myconf="--enable-default-storage=gdbm";
-	fi
-
-	econf ${myconf} \
-		--enable-default-agent=iptables \
-		--enable-default-access=files \
-		--enable-classic=yes \
-		|| die "./configure failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	einfo "self test is broken"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	dodir /var/lib/ipac
-
-	insinto /etc/ipac-ng
-	newins ${FILESDIR}/ipac.conf.1.30 ipac.conf
-	newins ${FILESDIR}/rules.conf.1.30 rules.conf
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipac-ng.rc.1.30 ipac-ng
-
-	exeinto /etc/cron.hourly
-	newexe ${FILESDIR}/ipac-ng.cron.1.30 ipac-ng
-
-	dodoc README TODO doc/* CHANGELOG
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "                         W A R N I N G !"
-	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
-	ewarn "this WILL save ipac rules and can cause problems!"
-	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
-	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn
-	einfo "the accounting database is at /var/lib/ipac"
-	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
-	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.daily/ipac-ng"
-	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
-	einfo "stop/start the service so your iptables gets updated"
-	einfo "if ipac is not working with the default configuration make"
-	einfo "rm /etc/ipac-ng/* and rm /var/lib/ipac/* and emerge again"
-}