repoman

4 files changed, 50 insertions, 86 deletions

diff --git a/net-analyzer/nagios/files/digest-nagios-1.0 b/net-analyzer/nagios/files/digest-nagios-1.0
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-analyzer/nagios/files/digest-nagios-1.0
+++ /dev/null
diff --git a/net-analyzer/nagios/nagios-1.0-r1.ebuild b/net-analyzer/nagios/nagios-1.0-r1.ebuild
index 338ce4652d81..eb9f548b0054 100644
--- a/net-analyzer/nagios/nagios-1.0-r1.ebuild
+++ b/net-analyzer/nagios/nagios-1.0-r1.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.0-r1.ebuild,v 1.2 2003/02/13 13:43:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.0-r1.ebuild,v 1.3 2003/08/05 17:55:03 vapier Exp $
 
-DESCRIPTION="Nagios $PV - merge this to pull install all of the nagios packages"
+DESCRIPTION="Nagios ${PV} - merge this to pull install all of the nagios packages"
 HOMEPAGE="http://www.nagios.org/"
-RDEPEND=">=net-analyzer/nagios-core-1.0
-		 >=net-analyzer/nagios-plugins-1.3.0_beta2
-		 >=net-analyzer/nagios-nrpe-1.7
-		 >=net-analyzer/nagios-nsca-2.2
-		 >=net-analyzer/nagios-imagepack-1.0"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc"
+
+RDEPEND=">=net-analyzer/nagios-core-1.0
+	>=net-analyzer/nagios-plugins-1.3.0_beta2
+	>=net-analyzer/nagios-nrpe-1.7
+	>=net-analyzer/nagios-nsca-2.2
+	>=net-analyzer/nagios-imagepack-1.0"
+
 pkg_postinst() {
 	einfo
 	einfo "Remember to edit the config files in /etc/nagios"
@@ -35,5 +37,3 @@ pkg_postinst() {
 	einfo "filesystem."
 	einfo
 }
-
-
diff --git a/net-analyzer/nagios/nagios-1.0.ebuild b/net-analyzer/nagios/nagios-1.0.ebuild
deleted file mode 100644
index 7d75166b35d5..000000000000
--- a/net-analyzer/nagios/nagios-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.0.ebuild,v 1.4 2003/02/13 13:43:22 vapier Exp $
-
-DESCRIPTION="Nagios $PV - merge this to pull install all of the nagios packages"
-HOMEPAGE="http://www.nagios.org/"
-RDEPEND=`echo ~net-analyzer/nagios-{core-1.0,plugins-1.3.0_beta2,nrpe-1.7,nsca-2.2,imagepack-1.0}`
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
-pkg_postinst() {
-	einfo
-	einfo "Remember to edit the config files in /etc/nagios"
-	einfo "Also, if you want nagios to start at boot time"
-	einfo "remember to execute rc-update add nagios default"
-	einfo
-	einfo "To have nagios visable on the web, please do the following:"
-	einfo "1. Execute the command:"
-	einfo " \"ebuild /var/db/pkg/net-analyzer/nagios-core-${PV}/nagios-core-${PV}.ebuild config\""
-	einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-	einfo
-	einfo "That will make nagios's web front end visable via"
-	einfo "http://localhost/nagios/"
-	einfo
-	einfo "The Apache config file for nagios will be in"
-	einfo "/etc/apache/conf/addon-modules/ with the name of"
-	einfo "nagios.conf."
-	einfo "Also, if your kernel has /proc protection, nagios"
-	einfo "will not be happy as it relies on accessing the proc"
-	einfo "filesystem."
-	einfo
-}
-
-
diff --git a/net-analyzer/nagios/nagios-1.1.ebuild b/net-analyzer/nagios/nagios-1.1.ebuild
index d8c030462b8b..5bffe1591443 100644
--- a/net-analyzer/nagios/nagios-1.1.ebuild
+++ b/net-analyzer/nagios/nagios-1.1.ebuild
@@ -1,51 +1,50 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.1.ebuild,v 1.4 2003/06/20 16:55:21 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.1.ebuild,v 1.5 2003/08/05 17:55:03 vapier Exp $
 
 DESCRIPTION="Nagios ${PV} - merge this to pull install all of the nagios packages"
 HOMEPAGE="http://www.nagios.org/"
-RDEPEND=">=net-analyzer/nagios-core-1.1
-		 >=net-analyzer/nagios-plugins-1.3.0
-		 >=net-analyzer/nagios-nrpe-1.8
-		 >=net-analyzer/nagios-nsca-2.3
-		 >=net-analyzer/nagios-imagepack-1.0"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc"
-pkg_postinst() {
-    einfo
-    einfo "Remember to edit the config files in /etc/nagios"
-    einfo "Also, if you want nagios to start at boot time"
-    einfo "remember to execute rc-update add nagios default"
-    einfo
-    einfo "To have nagios visable on the web, please do the following:"
-    if [ "`use apache2`" ] ; then
-        einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-    else
-        einfo "1. Execute the command:"
-        einfo " \"ebuild /var/db/pkg/net-analyzer/nagios-core-${PV}/nagios-core-${PV}.ebuild config\""
-        einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-    fi
-    einfo
-    einfo "That will make nagios's web front end visable via"
-    einfo "http://localhost/nagios/"
-    einfo
-    if [ "`use apache2`" ] ; then
-        einfo "The Apache2 config file for nagios will be in"
-        einfo "/etc/apache2/conf/modules.d with the name of"
-        einfo "99_nagios.conf."
-    else
-        einfo "The Apache config file for nagios will be in"
-        einfo "/etc/apache/conf/addon-modules/ with the name of"
-        einfo "nagios.conf."
-    fi
-    einfo "Also, if your kernel has /proc protection, nagios"
-    einfo "will not be happy as it relies on accessing the proc"
-    einfo "filesystem. You can fix this by adding nagios into"
-    einfo "the group wheel, but this is not recomended."
-    einfo
-
-}
 
+RDEPEND=">=net-analyzer/nagios-core-1.1
+	>=net-analyzer/nagios-plugins-1.3.0
+	>=net-analyzer/nagios-nrpe-1.8
+	>=net-analyzer/nagios-nsca-2.3
+	>=net-analyzer/nagios-imagepack-1.0"
 
+pkg_postinst() {
+	einfo
+	einfo "Remember to edit the config files in /etc/nagios"
+	einfo "Also, if you want nagios to start at boot time"
+	einfo "remember to execute rc-update add nagios default"
+	einfo
+	einfo "To have nagios visable on the web, please do the following:"
+	if [ "`use apache2`" ] ; then
+		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
+	else
+		einfo "1. Execute the command:"
+		einfo " \"ebuild /var/db/pkg/net-analyzer/nagios-core-${PV}/nagios-core-${PV}.ebuild config\""
+		einfo " 2. Edit /etc/conf.d/apache and add \"-D NAGIOS\""
+	fi
+	einfo
+	einfo "That will make nagios's web front end visable via"
+	einfo "http://localhost/nagios/"
+	einfo
+	if [ "`use apache2`" ] ; then
+		einfo "The Apache2 config file for nagios will be in"
+		einfo "/etc/apache2/conf/modules.d with the name of"
+		einfo "99_nagios.conf."
+	else
+		einfo "The Apache config file for nagios will be in"
+		einfo "/etc/apache/conf/addon-modules/ with the name of"
+		einfo "nagios.conf."
+	fi
+	einfo "Also, if your kernel has /proc protection, nagios"
+	einfo "will not be happy as it relies on accessing the proc"
+	einfo "filesystem. You can fix this by adding nagios into"
+	einfo "the group wheel, but this is not recomended."
+	einfo
+}