Fixed several binary package problems. Closes bug #63502.

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 5eb6406cbb9a0a7db8f83ba5f8ae8c95ad58d2ec..83759ea2369325af645188d42f445c235b7c03de 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.41 2004/10/20 18:01:49 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.42 2004/10/20 18:53:02 eldad Exp $
+
+  20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild:
+  Fixed several binary package problems. Closes bug #63502.
 
   20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
   nagios-core-1.2-r3.ebuild:

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
index d39558ea0cae22f3b7e0efccdb3167f5b0f8381b..49576c33f93356e008e5af5dab8ea04c1333fd0a 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r2.ebuild,v 1.8 2004/10/20 18:22:24 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r2.ebuild,v 1.9 2004/10/20 18:53:02 eldad Exp $
 
 inherit eutils
 
@@ -147,6 +147,14 @@ src_install() {
        insinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
        doins contrib/eventhandlers/redundancy-scenario1/*
 
+       chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
+       keepdir /usr/nagios/share/ssi
+       chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
+       keepdir /var/nagios
+       keepdir /var/nagios/archives
+       chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
+       keepdir /var/nagios/rw
+
        #Apache Module
 
        if use !noweb; then
@@ -165,13 +173,6 @@ pkg_preinst() {
        einfo "Sample config files installed by default will always"
        einfo "include cgi.cfg"
        einfo "The sample configs can be found in /usr/share/doc/${PF}/sample-configs/"
-       chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-       keepdir /usr/nagios/share/ssi
-       chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-       keepdir /var/nagios
-       keepdir /var/nagios/archives
-       chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-       keepdir /var/nagios/rw
 
        enewgroup nagios
 

diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
index 6b7a1380daa770a7f30893f4893974faec68deff..ec471033395d1812becf65d04c407a7443cd653c 100644 (file)
--- a/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.3 2004/10/20 18:22:24 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r3.ebuild,v 1.4 2004/10/20 18:53:02 eldad Exp $
 
 inherit eutils
 
@@ -159,8 +159,12 @@ src_install() {
        exeinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
        doexe contrib/eventhandlers/redundancy-scenario1/*
 
-       #Apache Module
+       for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib
+       do
+               chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
+       done
 
+       #Apache Module
        if use !noweb; then
                if use apache2; then
                        insinto /etc/apache2/conf/modules.d
@@ -170,7 +174,6 @@ src_install() {
                        doins ${FILESDIR}/nagios.conf
                fi
        fi
-
 }
 
 pkg_preinst() {
@@ -193,11 +196,6 @@ pkg_preinst() {
                usermod -G apache nagios
                chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
        fi
-
-       for dir in etc/nagios usr/nagios var/nagios usr/nagios/contrib
-       do
-               chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
-       done
 }
 
 pkg_postinst() {