Fixed compilation problem reported by Nick Soveiko <gentoo-bugzilla AT alerik.org> in bug #168067. Fixed || ( use? ( ) ) constructs bug #168179.

Package-Manager: portage-2.1.2-r9

4 files changed, 37 insertions, 26 deletions

diff --git a/net-analyzer/ipac-ng/ChangeLog b/net-analyzer/ipac-ng/ChangeLog
index 3b6ac7a2037b..b0ba97b2753a 100644
--- a/net-analyzer/ipac-ng/ChangeLog
+++ b/net-analyzer/ipac-ng/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/ipac-ng
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.25 2006/11/01 14:24:22 jokey Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.26 2007/03/01 07:02:07 pva Exp $
+
+  01 Mar 2007; <pva@gentoo.org>
+  +files/ipac-ng-1.31-lable-at-the-end-of-compound.patch,
+  ipac-ng-1.31-r2.ebuild:
+  Fixed compilation problem reported by Nick Soveiko <gentoo-bugzilla AT
+  alerik.org> in bug #168067. Fixed || ( use? ( ) ) constructs bug #168179.
 
   01 Nov 2006; Markus Ullmann <jokey@gentoo.org> -ipac-ng-1.31.ebuild,
   ipac-ng-1.31-r2.ebuild:
diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index 1f2a2a4cc09a..65150c13fcd0 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,10 +1,11 @@
------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-1.31-lable-at-the-end-of-compound.patch 276 RMD160 03cfa6e064168c32e6fed47417648f39fc10e461 SHA1 4d25723c02f946a9d03655e38be8fed7f4c0d091 SHA256 404060df91c1201fd9651afad4806a15a4db446f458b4267e877c3ad1de09146
+MD5 c0b292a712f5a60a4a5f8d552e9e8fd8 files/ipac-ng-1.31-lable-at-the-end-of-compound.patch 276
+RMD160 03cfa6e064168c32e6fed47417648f39fc10e461 files/ipac-ng-1.31-lable-at-the-end-of-compound.patch 276
+SHA256 404060df91c1201fd9651afad4806a15a4db446f458b4267e877c3ad1de09146 files/ipac-ng-1.31-lable-at-the-end-of-compound.patch 276
 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
@@ -23,14 +24,14 @@ RMD160 a1dffd63f1bcc8e2427775182f56b2bdfc69a869 files/rules.conf.1.30 1046
 SHA256 714cea1d01128c630c9a53110188877ea3a77b028fb12900b6252e793cdaee5b files/rules.conf.1.30 1046
 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
+EBUILD ipac-ng-1.31-r2.ebuild 2796 RMD160 bec1de0fc9bd158c43c51907878b742c7af321df SHA1 8ca088c642e192b2210de92975f6b25da7ecb2c9 SHA256 4b7c9e8f401cb77908fd784dd01469613647b2a05df0355114ee73743c7267b9
+MD5 2dd0e670defbf5ab73f698e5dfd3899e ipac-ng-1.31-r2.ebuild 2796
+RMD160 bec1de0fc9bd158c43c51907878b742c7af321df ipac-ng-1.31-r2.ebuild 2796
+SHA256 4b7c9e8f401cb77908fd784dd01469613647b2a05df0355114ee73743c7267b9 ipac-ng-1.31-r2.ebuild 2796
+MISC ChangeLog 4758 RMD160 52c684ec42497184b610a68330e35975caff24f2 SHA1 d212e2db25f4057cb60ae04c15ea1f316e0e48a2 SHA256 11f1c0ca40aa9f4fb31c0b06e951a3f255fa8da2c663eb0487409fcddf1a3e20
+MD5 8cf80e4c2f21861aea5b335a488e9d99 ChangeLog 4758
+RMD160 52c684ec42497184b610a68330e35975caff24f2 ChangeLog 4758
+SHA256 11f1c0ca40aa9f4fb31c0b06e951a3f255fa8da2c663eb0487409fcddf1a3e20 ChangeLog 4758
 MISC metadata.xml 286 RMD160 92f59ba848186619ed6753f6cbbfd8deb3052092 SHA1 f04be974c4bf21f3dad4a34abb3ef205726715ae SHA256 b68c20680aaf86f9886146aad86f532a115427854196c394aebf96725aa660a3
 MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
 RMD160 92f59ba848186619ed6753f6cbbfd8deb3052092 metadata.xml 286
@@ -38,10 +39,3 @@ SHA256 b68c20680aaf86f9886146aad86f532a115427854196c394aebf96725aa660a3 metadata
 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/ipac-ng-1.31-lable-at-the-end-of-compound.patch b/net-analyzer/ipac-ng/files/ipac-ng-1.31-lable-at-the-end-of-compound.patch
new file mode 100644
index 000000000000..39de7f6b1795
--- /dev/null
+++ b/net-analyzer/ipac-ng/files/ipac-ng-1.31-lable-at-the-end-of-compound.patch
@@ -0,0 +1,10 @@
+--- ./agents/ipchains/libipfwc.c.orig	2007-02-28 18:41:43.000000000 +0300
++++ ./agents/ipchains/libipfwc.c	2007-02-28 18:41:52.000000000 +0300
+@@ -501,6 +501,7 @@
+ 					       " transparent proxying?)");
+ 					break;
+ 				default:
++					break;
+ 				}
+ 			return message;
+ 		}
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
index a7638df9dfb0..8c8c0509a89e 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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-r2.ebuild,v 1.6 2006/11/01 14:24:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r2.ebuild,v 1.7 2007/03/01 07:02:07 pva Exp $
 
 inherit eutils
 
@@ -14,10 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="gd sqlite postgres"
 
-RDEPEND="virtual/libc
-	|| ( sqlite? ( =dev-db/sqlite-2* )
-		postgres? ( dev-db/postgresql )
-		sys-libs/gdbm )"
+RDEPEND="postgres? ( dev-db/postgresql )
+		!postgres? ( sqlite? ( =dev-db/sqlite-2* )
+					!sqlite? ( sys-libs/gdbm ) )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex"
@@ -36,8 +35,10 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	epatch "${WORKDIR}"/${P}-iptables-1.3.1.patch
 	epatch "${WORKDIR}"/ipcop-${P}-fetchcounter.patch
+	epatch "${FILESDIR}"/${P}-lable-at-the-end-of-compound.patch
 }
 
 src_compile() {