use epatch for patches

12 files changed, 32 insertions, 607 deletions

diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.0 b/net-analyzer/nagios-core/files/digest-nagios-core-1.0
deleted file mode 100644
index 1fb04288cd39..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f95388c59b34c06745870fd2012388e nagios-1.0.tar.gz 1616233
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.0-r1 b/net-analyzer/nagios-core/files/digest-nagios-core-1.0-r1
deleted file mode 100644
index 1fb04288cd39..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f95388c59b34c06745870fd2012388e nagios-1.0.tar.gz 1616233
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.1 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1
deleted file mode 100644
index 14267bedc75b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f48ecd9bad2c4d7c9d88d0b6f347ecf nagios-1.1.tar.gz 1619888
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1
deleted file mode 100644
index 14267bedc75b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f48ecd9bad2c4d7c9d88d0b6f347ecf nagios-1.1.tar.gz 1619888
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r2 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r2
deleted file mode 100644
index 14267bedc75b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f48ecd9bad2c4d7c9d88d0b6f347ecf nagios-1.1.tar.gz 1619888
diff --git a/net-analyzer/nagios-core/nagios-core-1.0-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.0-r1.ebuild
deleted file mode 100644
index 7162616c4265..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +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-core/nagios-core-1.0-r1.ebuild,v 1.2 2003/02/13 13:43:51 vapier Exp $
-DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nagios-1.0.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE=""
-DEPEND=">=jpeg-6b-r2
-		>=libpng-1.2.4
-		>=libgd-1.8.3-r5
-		>=perl-5.6.1-r7
-		>=traceroute-1.4_p12
-		>=mailx-8.1
-		>=apache-1.3.27-r1"
-S="${WORKDIR}/nagios-1.0"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--enable-embedded-perl \
-		--with-perlcache \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/nagios.conf
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-	insinto /etc/nagios
-	doins ${FILESDIR}/nagios.cfg-sample
-}
-pkg_preinst() {
-
-    userdel nagios 2> /dev/null
-    if ! groupmod nagios; then
-        groupadd -g 75 nagios 2> /dev/null || \
-            die "Failed to create nagios group"
-    fi
-    useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-        die "Failed to create nagios user"
-	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-}
-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/${PF}/${PF}.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
-}
-
-pkg_config() {
-		echo "Include  conf/addon-modules/nagios.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-	einfo
-	einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
-	einfo
-}
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-1.0.ebuild b/net-analyzer/nagios-core/nagios-core-1.0.ebuild
deleted file mode 100644
index cf7e68db561e..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.0.ebuild
+++ /dev/null
@@ -1,87 +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-core/nagios-core-1.0.ebuild,v 1.3 2003/02/13 13:43:39 vapier Exp $
-DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nagios-1.0.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE=""
-DEPEND=">=jpeg-6b-r2
-		>=libpng-1.2.4
-		>=libgd-1.8.3-r5
-		>=perl-5.6.1-r7
-		>=traceroute-1.4_p12
-		>=mailx-8.1
-		>=apache-1.3.27-r1"
-S="${WORKDIR}/nagios-1.0"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--enable-embedded-perl \
-		--with-perlcache \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/nagios.conf
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-}
-pkg_preinst() {
-
-    userdel nagios 2> /dev/null
-    if ! groupmod nagios; then
-        groupadd -g 75 nagios 2> /dev/null || \
-            die "Failed to create nagios group"
-    fi
-    useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-        die "Failed to create nagios user"
-	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-}
-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/${PF}/${PF}.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
-}
-
-pkg_config() {
-		echo "Include  conf/addon-modules/nagios.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-	einfo
-	einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
-	einfo
-}
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild
deleted file mode 100644
index b289fe5cc39a..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.1-r1.ebuild
+++ /dev/null
@@ -1,128 +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-core/nagios-core-1.1-r1.ebuild,v 1.1 2003/06/17 20:15:39 alron Exp $
-inherit eutils
-
-DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE="apache2"
-DEPEND=">=jpeg-6b-r2
-		>=libpng-1.2.4
-		>=libgd-1.8.3-r5
-		>=perl-5.6.1-r7
-		>=traceroute-1.4_p12
-		>=mailx-8.1
-		|| (
-		>=apache-1.3.27-r1
-		apache2 ( >=net-www/apache-2.0.43-r1 )
-		)"
-S="${WORKDIR}/nagios-1.1"
-pkg_setup() {
-	enewgroup nagios 
-	enewuser nagios -1 /bin/bash /dev/null nagios
-	# Old Style removed because of eutils class
-	#userdel nagios 2> /dev/null
-	#if ! groupmod nagios; then
-	#	groupadd -g 75 nagios 2> /dev/null || \
-	#		die "Failed to create nagios group"
-	#fi
-	#useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-	#	die "Failed to create nagios user"
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
-	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
-}
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--enable-embedded-perl \
-		--with-perlcache \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-#	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
-	make DESTDIR=${D} install install-config install-commandmode || die
-	if [ "`use apache2`" ] ; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/99_nagios.conf
-	else
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/nagios.conf
-	fi
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-	insinto /etc/nagios
-	doins ${FILESDIR}/nagios.cfg-sample
-}
-pkg_preinst() {
-	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-	touch ${D}/usr/nagios/share/ssi/.keep
-	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-	touch ${D}/var/nagios/.keep
-	touch ${D}/var/nagios/archives/.keep
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	touch ${D}/var/nagios/rw/.keep
-	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-}
-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/${PF}/${PF}.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
-}
-
-pkg_config() {
-	if [ "`use apache2`" ] ; then
-		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-	else
-		echo "Include  conf/addon-modules/nagios.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-		einfo
-		einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		einfo
-	fi
-}
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r2.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r2.ebuild
deleted file mode 100644
index 89153fc668f0..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.1-r2.ebuild
+++ /dev/null
@@ -1,128 +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-core/nagios-core-1.1-r2.ebuild,v 1.1 2003/06/20 18:18:50 alron Exp $
-inherit eutils
-
-DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE="apache2"
-DEPEND=">=jpeg-6b-r2
-		>=libpng-1.2.4
-		>=libgd-1.8.3-r5
-		>=perl-5.6.1-r7
-		>=traceroute-1.4_p12
-		>=mailx-8.1
-		|| (
-		>=apache-1.3.27-r1
-		apache2 ( >=net-www/apache-2.0.43-r1 )
-		)"
-S="${WORKDIR}/nagios-1.1"
-pkg_setup() {
-	enewgroup nagios 
-	enewuser nagios -1 /bin/bash /dev/null nagios
-	# Old Style removed because of eutils class
-	#userdel nagios 2> /dev/null
-	#if ! groupmod nagios; then
-	#	groupadd -g 75 nagios 2> /dev/null || \
-	#		die "Failed to create nagios group"
-	#fi
-	#useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-	#	die "Failed to create nagios user"
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
-	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
-}
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--enable-embedded-perl \
-		--with-perlcache \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-#	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
-	make DESTDIR=${D} install install-config install-commandmode || die
-	if [ "`use apache2`" ] ; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/99_nagios.conf
-	else
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/nagios.conf
-	fi
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-	insinto /etc/nagios
-	doins ${FILESDIR}/nagios.cfg-sample
-}
-pkg_preinst() {
-	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-	touch ${D}/usr/nagios/share/ssi/.keep
-	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-	touch ${D}/var/nagios/.keep
-	touch ${D}/var/nagios/archives/.keep
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	touch ${D}/var/nagios/rw/.keep
-	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-}
-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/${PF}/${PF}.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
-}
-
-pkg_config() {
-	if [ "`use apache2`" ] ; then
-		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-	else
-		echo "Include  conf/addon-modules/nagios.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-		einfo
-		einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		einfo
-	fi
-}
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r3.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r3.ebuild
index f011ee3df2a6..68901a498254 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r3.ebuild
@@ -1,51 +1,41 @@
 # 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-core/nagios-core-1.1-r3.ebuild,v 1.1 2003/07/19 23:22:04 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r3.ebuild,v 1.2 2003/08/03 03:21:06 vapier Exp $
+
 inherit eutils
 
 DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc"
 IUSE="gd apache2 perl"
-DEPEND=">=mailx-8.1
 
+DEPEND=">=mailx-8.1
 	apache2? ( >=net-www/apache-2.0.43-r1 )  
-	
 	gd? ( 
-	>=jpeg-6b-r3
-	>=libpng-1.2.5-r4
-	>=libgd-1.8.3-r5 
+		>=jpeg-6b-r3
+		>=libpng-1.2.5-r4
+		>=libgd-1.8.3-r5 
 	) 
-	
 	perl? ( >=perl-5.6.1-r7 )
-	
 	mysql? ( >=dev-db/mysql-3.23.56 ) 
 	pgsql? ( >=dev-db/postgresql-7.3.2 )"
-	
-S="${WORKDIR}/nagios-1.1"
+
+S="${WORKDIR}/nagios-${PV}"
+
 pkg_setup() {
 	enewgroup nagios 
 	enewuser nagios -1 /bin/bash /dev/null nagios
-	# Old Style removed because of eutils class
-	#userdel nagios 2> /dev/null
-	#if ! groupmod nagios; then
-	#	groupadd -g 75 nagios 2> /dev/null || \
-	#		die "Failed to create nagios group"
-	#fi
-	#useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-	#	die "Failed to create nagios user"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
-	if [ -n "`use gd`" ]; then
-	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
-	fi
+	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+	[ `use gd` ] && epatch ${FILESDIR}/tac.cgi.diff.bz2
 }
 
 src_compile() {
@@ -60,7 +50,7 @@ src_compile() {
 	--with-pgsql-retention --with-pgsql-downtime"
 	
 	use perl && myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	
+
 	use debug0 && myconf="${myconf} --enable-DEBUG0"
 	use debug1 && myconf="${myconf} --enable-DEBUG1"
 	use debug2 && myconf="${myconf} --enable-DEBUG2"
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
index dc4f83849a97..31194b009897 100644
--- a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
@@ -1,51 +1,41 @@
 # 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-core/nagios-core-1.1-r4.ebuild,v 1.1 2003/07/20 13:43:30 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild,v 1.2 2003/08/03 03:21:06 vapier Exp $
+
 inherit eutils
 
 DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc"
 IUSE="gd apache2 perl"
-DEPEND=">=mailx-8.1
 
+DEPEND=">=mailx-8.1
 	apache2? ( >=net-www/apache-2.0.43-r1 )  
-	
 	gd? ( 
-	>=jpeg-6b-r3
-	>=libpng-1.2.5-r4
-	>=libgd-1.8.3-r5 
+		>=jpeg-6b-r3
+		>=libpng-1.2.5-r4
+		>=libgd-1.8.3-r5 
 	) 
-	
 	perl? ( >=perl-5.6.1-r7 )
-	
 	mysql? ( >=dev-db/mysql-3.23.56 ) 
 	pgsql? ( >=dev-db/postgresql-7.3.2 )"
 	
-S="${WORKDIR}/nagios-1.1"
+S="${WORKDIR}/nagios-${PV}"
+
 pkg_setup() {
 	enewgroup nagios 
 	enewuser nagios -1 /bin/bash /dev/null nagios
-	# Old Style removed because of eutils class
-	#userdel nagios 2> /dev/null
-	#if ! groupmod nagios; then
-	#	groupadd -g 75 nagios 2> /dev/null || \
-	#		die "Failed to create nagios group"
-	#fi
-	#useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-	#	die "Failed to create nagios user"
 }
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
-	if [ -n "`use gd`" ]; then
-	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
-	fi
+	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+	[ `use gd` ] && epatch ${FILESDIR}/tac.cgi.diff.bz2
 }
 
 src_compile() {
@@ -100,14 +90,14 @@ src_install() {
 	doins ${FILESDIR}/nagios.cfg-sample
 	insinto /usr/nagios/contrib
 	doins contrib/*
-    insinto /usr/nagios/contrib/database
-    doins contrib/database/*
-    insinto /usr/nagios/contrib/eventhandlers
-    doins contrib/eventhandlers/*
-    insinto /usr/nagios/contrib/eventhandlers/distributed-monitoring
-    doins contrib/eventhandlers/distributed-monitoring/*
-    insinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
-    doins contrib/eventhandlers/redundancy-scenario1/*
+	insinto /usr/nagios/contrib/database
+	doins contrib/database/*
+	insinto /usr/nagios/contrib/eventhandlers
+	doins contrib/eventhandlers/*
+	insinto /usr/nagios/contrib/eventhandlers/distributed-monitoring
+	doins contrib/eventhandlers/distributed-monitoring/*
+	insinto /usr/nagios/contrib/eventhandlers/redundancy-scenario1
+	doins contrib/eventhandlers/redundancy-scenario1/*
 }
 
 pkg_preinst() {
diff --git a/net-analyzer/nagios-core/nagios-core-1.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.1.ebuild
deleted file mode 100644
index 0897cd92bc0b..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.1.ebuild
+++ /dev/null
@@ -1,118 +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-core/nagios-core-1.1.ebuild,v 1.1 2003/06/10 21:12:44 alron Exp $
-DESCRIPTION="Nagios $PV core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/nagios-1.1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
-IUSE="apache2"
-DEPEND=">=jpeg-6b-r2
-		>=libpng-1.2.4
-		>=libgd-1.8.3-r5
-		>=perl-5.6.1-r7
-		>=traceroute-1.4_p12
-		>=mailx-8.1
-		|| (
-		>=apache-1.3.27-r1
-		apache2 ( >=net-www/apache-2.0.43-r1 )
-		)"
-S="${WORKDIR}/nagios-1.1"
-pkg_setup() {
-	userdel nagios 2> /dev/null
-	if ! groupmod nagios; then
-		groupadd -g 75 nagios 2> /dev/null || \
-			die "Failed to create nagios group"
-	fi
-	useradd -u 75 -g nagios -s /dev/null -d /var/empty -c "nagios" nagios || \
-		die "Failed to create nagios user"
-}
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	bzcat ${FILESDIR}/Makefile-distclean.diff.bz2 | patch -p1
-	bzcat ${FILESDIR}/tac.cgi.diff.bz2 | patch -p1
-}
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--enable-embedded-perl \
-		--with-perlcache \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	make DESTDIR=${D} COMMAND_OPTS="" INSTALL_OPTS="" install install-config install-commandmode || die
-	if [ "`use apache2`" ] ; then
-		insinto /etc/apache2/conf/modules.d
-		doins ${FILESDIR}/99_nagios.conf
-	else
-		insinto /etc/apache/conf/addon-modules
-		doins ${FILESDIR}/nagios.conf
-	fi
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-	insinto /etc/nagios
-	doins ${FILESDIR}/nagios.cfg-sample
-}
-pkg_preinst() {
-	chown -R nagios:nagios ${D}/etc/nagios || die "Failed Chown of ${D}/etc/nagios"
-	chown -R nagios:nagios ${D}/usr/nagios || die "Failed Chown of ${D}/usr/nagios"
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-}
-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/${PF}/${PF}.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
-}
-
-pkg_config() {
-	if [ "`use apache2`" ] ; then
-		einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-	else
-		echo "Include  conf/addon-modules/nagios.conf" \
-			>> ${ROOT}/etc/apache/conf/apache.conf
-		einfo
-		einfo "Remember to edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		einfo
-	fi
-}
-pkg_prerm() {
-	/etc/init.d/nagios stop
-}