6 files changed, 17 insertions, 11 deletions
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 74756145cea2..2b27abe482c1 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # 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.59 2005/10/15 22:04:12 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.60 2005/10/15 23:22:12 soulse Exp $
+
+  15 Oct 2005; <soulse@gentoo.org> +files/nagios-2.0b.cfg-sample.gz,
+  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
+  nagios-core-2.0b_p4.ebuild:
+  Fixed ebuilds as per bug #103945 thanks to David Sparks <daves@activestate.com>
 
   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
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index ada96d2fa44c..9b82b6356dfa 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,18 +1,19 @@
 MD5 0e1d15124e78345a902d3fa356448823 ChangeLog 10429
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
 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
+MD5 be61a216e00ba59d16189e4a48a61526 nagios-core-2.0b_p1.ebuild 5835
+MD5 c6f1f40ff1403b13c9150b732d8049a5 nagios-core-2.0b_p2.ebuild 5866
+MD5 147783c2f06e5f06f39a70d433c7fff6 nagios-core-2.0b_p4.ebuild 5866
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
+MD5 6b679390ce57974a0f69145e0918372f files/nagios-2.0b.cfg-sample.gz 8990
+MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
 MD5 aa5bb53aee1f5609395e8184f2eff4a6 files/digest-nagios-core-2.0b_p1 65
 MD5 19566d92e4989244216c7fb6d19d688c files/digest-nagios-core-2.0b_p2 65
 MD5 d062be8c632fbfa88dd1194e0bea2abf files/nagios 1389
-MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
 MD5 7a96e80dbe17f26441d3266662b58a51 files/digest-nagios-core-2.0b_p4 65
diff --git a/net-analyzer/nagios-core/files/nagios-2.0b.cfg-sample.gz b/net-analyzer/nagios-core/files/nagios-2.0b.cfg-sample.gz
new file mode 100644
index 000000000000..8b459b3585b1
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-2.0b.cfg-sample.gz
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild
index 8ab8a1623084..a3f6e1eff4a2 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p1.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-2.0b_p1.ebuild,v 1.6 2005/10/11 03:02:23 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p1.ebuild,v 1.7 2005/10/15 23:22:12 soulse Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/2.x-series-nsca.patch
-	gunzip -c ${FILESDIR}/nagios.cfg-sample.gz > ./nagios.cfg-sample
+	gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample
 }
 
 src_compile() {
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild
index e36f4c034b89..b44537ecc2c9 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p2.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-2.0b_p2.ebuild,v 1.6 2005/10/11 03:02:23 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p2.ebuild,v 1.7 2005/10/15 23:22:12 soulse Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -52,7 +52,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/2.x-series-nsca.patch
-	gunzip -c ${FILESDIR}/nagios.cfg-sample.gz > ./nagios.cfg-sample
+	gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample
 }
 
 src_compile() {
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
index 689d47af9f68..0742eb8ac59a 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p4.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-2.0b_p4.ebuild,v 1.2 2005/10/11 03:02:23 soulse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild,v 1.3 2005/10/15 23:22:12 soulse Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -52,7 +52,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/2.x-series-nsca.patch
-	gunzip -c ${FILESDIR}/nagios.cfg-sample.gz > ./nagios.cfg-sample
+	gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample
 }
 
 src_compile() {