Fixed ebuild as per bug #99128

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index f10e2e0535551254a6b85208550bef82b5497bc1..74756145cea2c8cc0cedeb5efbc3e95d386a68dd 100644 (file)
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.58 2005/10/11 03:02:23 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.59 2005/10/15 22:04:12 soulse Exp $
+
+  15 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild:
+  Fixed ebuild as per bug #99128 thanks to k_berbach@gmx.de and
+  richardc@bifco.com
 
   10 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild,
   nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 72045502e12adecf2b9843ce2322d99eca9560e7..ada96d2fa44cc888b102c31a42e8fa94eec42e44 100644 (file)
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,6 +1,6 @@
-MD5 027674f11ae042615c66d723a6c00f2c ChangeLog 10281
+MD5 0e1d15124e78345a902d3fa356448823 ChangeLog 10429
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
-MD5 ebee553340e8edcdf915e3b9fab01b9d nagios-core-1.2-r4.ebuild 7118
+MD5 92fb214ff93f5f66c997ea1b00fab6c5 nagios-core-1.2-r4.ebuild 7183
 MD5 3d9f085b88202cbc8107eb3d9ca50b93 nagios-core-2.0b_p1.ebuild 5830
 MD5 b6f0fdafd85266f0a1f24cafb7cd0017 nagios-core-2.0b_p2.ebuild 5861
 MD5 a4340f0a04241083903ec43b9a3ded53 nagios-core-2.0b_p4.ebuild 5861

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 8a6865cf3a03660b2def156f9221aaaca2e751b7..f5fcc331345ae665c9b0df17c8023ffeb9d2ba42 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.8 2005/10/11 03:02:23 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.9 2005/10/15 22:04:12 soulse Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -57,6 +57,11 @@ src_unpack() {
        epatch ${FILESDIR}/submit_check_result_via_nsca.patch
 
        epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+
+       # libpq-fe.h isnt in psgql/ 
+       cd xdata/
+       sed -i -e "s:pgsql/::" *.c
+
        cp ${FILESDIR}/nagios.cfg-sample.gz ./
        gunzip nagios.cfg-sample.gz
 }
@@ -80,7 +85,7 @@ src_compile() {
        elif use postgres ; then
                myconf="${myconf} --with-pgsql-xdata"
 
-               if [ -r /usr/include/postgresql/pgsql/libpq-fe.h ] ; then
+               if [ -r /usr/include/postgresql/libpq-fe.h ] ; then
                        myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql"
                fi
        fi