Moved keepdir into src_install. Closes bug #130144.

Package-Manager: portage-2.0.54

7 files changed, 38 insertions, 23 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 7147ba5d30d2..91559f61ad03 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.74 2006/04/08 02:55:49 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.75 2006/04/17 00:16:27 eldad Exp $
+
+  17 Apr 2006; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r4.ebuild,
+  nagios-core-1.3.ebuild, nagios-core-2.0.ebuild, nagios-core-2.1.ebuild,
+  nagios-core-2.2.ebuild:
+  Moved keepdir into src_install. Closes bug #130144. Thanks to Milan Dadok
+  <dadok@kvados.cz> for reporting.
 
 *nagios-core-2.2 (08 Apr 2006)
 
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 21df6c2d1ece..8157c99582e2 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,4 +1,7 @@
-MD5 d2692db6c23f5859bb444bb6307281c8 ChangeLog 13305
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2c386a0806392210baa798023ca431a0 ChangeLog 13586
 MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
@@ -11,8 +14,15 @@ MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
 MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
-MD5 6e955d838dba98d7ac157ca9e3f4e0af nagios-core-1.2-r4.ebuild 7240
-MD5 cea5a3d589fdd00d45f20544f65759e5 nagios-core-1.3.ebuild 7472
-MD5 50c60e546174daae11e5a52077a98df2 nagios-core-2.0.ebuild 6013
-MD5 25ce85109cc79fcb6c6f00e2cd3a2a3f nagios-core-2.1.ebuild 6013
-MD5 3ec1bb216c946fe2938811b6d9e02b2f nagios-core-2.2.ebuild 6013
+MD5 435b6e015b93784d64c097368c80d3b9 nagios-core-1.2-r4.ebuild 7240
+MD5 13f8268203327ee2c466493656cac303 nagios-core-1.3.ebuild 7471
+MD5 3565838151dfdd3b39bf0cc7f356b7d7 nagios-core-2.0.ebuild 6010
+MD5 d1494bc5cee3ef3651f4e771b05ba1c5 nagios-core-2.1.ebuild 6010
+MD5 77384f9bc7601777e80329b2e5946006 nagios-core-2.2.ebuild 6010
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEQt5tT+MN7JbqCpMRAuPlAJsGSrCJ7gZP8576kYQ7CUd0ajEQSwCfbR56
+SEHQFRLhpAPeAfVkMzemFto=
+=cHpx
+-----END PGP SIGNATURE-----
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 ab7e29c142a5..2d996567af1d 100644
--- 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-2006 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.12 2006/01/28 21:42:17 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.13 2006/04/17 00:16:27 eldad Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -186,15 +186,15 @@ src_install() {
 			doins ${FILESDIR}/nagios.conf
 		fi
 	fi
-}
 
-pkg_preinst() {
 	keepdir /etc/nagios
 	keepdir /var/nagios
 	keepdir /var/nagios/archives
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
+}
 
+pkg_preinst() {
 	if use noweb; then
 		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
diff --git a/net-analyzer/nagios-core/nagios-core-1.3.ebuild b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
index 51144435e6d1..3f45878f0bef 100644
--- a/net-analyzer/nagios-core/nagios-core-1.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.3.ebuild,v 1.6 2006/01/28 21:42:17 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.3.ebuild,v 1.7 2006/04/17 00:16:27 eldad Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -198,15 +198,14 @@ src_install() {
 		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
 	done
 
-}
-
-pkg_preinst() {
 	keepdir /etc/nagios
 	keepdir /var/nagios
 	keepdir /var/nagios/archives
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
+}
 
+pkg_preinst() {
 	if use noweb; then
 		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
diff --git a/net-analyzer/nagios-core/nagios-core-2.0.ebuild b/net-analyzer/nagios-core/nagios-core-2.0.ebuild
index 9f476e3ff2f6..4e9dab0f5c09 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.ebuild,v 1.1 2006/02/08 14:28:10 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -161,15 +161,15 @@ src_install() {
 	for dir in etc/nagios usr/nagios var/nagios ; do
 		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
 	done
-}
 
-pkg_preinst() {
 	keepdir /etc/nagios
 	keepdir /var/nagios
 	keepdir /var/nagios/archives
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
+}
 
+pkg_preinst() {
 	if use noweb; then
 		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
diff --git a/net-analyzer/nagios-core/nagios-core-2.1.ebuild b/net-analyzer/nagios-core/nagios-core-2.1.ebuild
index 49080a11c3a9..d58614b665a5 100644
--- a/net-analyzer/nagios-core/nagios-core-2.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.ebuild,v 1.1 2006/04/03 02:38:04 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.1.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -161,15 +161,15 @@ src_install() {
 	for dir in etc/nagios usr/nagios var/nagios ; do
 		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
 	done
-}
 
-pkg_preinst() {
 	keepdir /etc/nagios
 	keepdir /var/nagios
 	keepdir /var/nagios/archives
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
+}
 
+pkg_preinst() {
 	if use noweb; then
 		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
diff --git a/net-analyzer/nagios-core/nagios-core-2.2.ebuild b/net-analyzer/nagios-core/nagios-core-2.2.ebuild
index 08e458c4910c..158864646f24 100644
--- a/net-analyzer/nagios-core/nagios-core-2.2.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.ebuild,v 1.1 2006/04/08 02:55:49 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.2.ebuild,v 1.2 2006/04/17 00:16:27 eldad Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -161,15 +161,15 @@ src_install() {
 	for dir in etc/nagios usr/nagios var/nagios ; do
 		chown -R nagios:nagios ${D}/${dir} || die "Failed chown of ${D}/${dir}"
 	done
-}
 
-pkg_preinst() {
 	keepdir /etc/nagios
 	keepdir /var/nagios
 	keepdir /var/nagios/archives
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
+}
 
+pkg_preinst() {
 	if use noweb; then
 		chown -R nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else