out with the old

5 files changed, 3 insertions, 417 deletions

diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 5755ce92016e..1fca44e29ec1 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 55fa8290eaeae60a1bdab8222aa8ff36 nagios-core-1.1-r6.ebuild 6387
 MD5 df422cf6458202d129a082849d466f3d nagios-core-1.2-r2.ebuild 6642
 MD5 9d02c8bcea641f69b7e36ac6a18e9076 ChangeLog 6433
 MD5 67125e899e40330692585273a7839c41 metadata.xml 980
 MD5 8e2eaa206717b94fb41508c7ab17a135 nagios-core-1.2-r1.ebuild 6669
-MD5 85cfb80668be1c5f7a6809399d394ccd nagios-core-1.1-r4.ebuild 5792
 MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
 MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
 MD5 00bd7731c70a158315e70338cee561a4 files/nagios 916
 MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
 MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
 MD5 f4f0b07e1a52477f83cbb9158db70391 files/tac.cgi.diff.bz2 204
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r4 63
-MD5 de44d331b40a2395b74c5ebf887b7675 files/digest-nagios-core-1.1-r6 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r1 63
 MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r2 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBGJk0T+MN7JbqCpMRAh1mAJsG95kJjV34lyTdR6Vprnd4ZGFCqgCcDbXg
-xQKQSgsKpn1wDrMBLjlDjOs=
-=k+qP
+iD8DBQFBGJw2T+MN7JbqCpMRAuEQAJ9qGaLf9ByfL7r3p9Mpcg0FYq1Z6ACfScv1
++B12fCl6B12WE7moKnCSuKQ=
+=ckKW
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r4 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r4
deleted file mode 100644
index 14267bedc75b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r4
+++ /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-r6 b/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r6
deleted file mode 100644
index 14267bedc75b..000000000000
--- a/net-analyzer/nagios-core/files/digest-nagios-core-1.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f48ecd9bad2c4d7c9d88d0b6f347ecf nagios-1.1.tar.gz 1619888
diff --git a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
deleted file mode 100644
index 694fd4b06671..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.1-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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.1-r4.ebuild,v 1.21 2004/08/10 09:48:14 eldad Exp $
-
-inherit eutils
-
-MY_P=${P/-core}
-DESCRIPTION="Nagios core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
-IUSE="gd apache2 perl mysql postgres debug noweb"
-
-DEPEND="virtual/mailx
-	apache2? ( >=net-www/apache-2.0.43-r1 )
-	gd? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-	)
-	perl? ( >=perl-5.6.1-r7 )
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	postgres? ( >=dev-db/postgresql-7.3.2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x /usr/bin/gdlib-config ]]; then
-		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
-	use gd && epatch ${FILESDIR}/tac.cgi.diff.bz2
-	cp ${FILESDIR}/nagios.cfg-sample.gz ./
-	gunzip nagios.cfg-sample.gz
-}
-
-src_compile() {
-	local myconf
-
-	use mysql && myconf="${myconf} --with-mysql-xdata \
-	--with-mysql-status --with-mysql-comments --with-mysql-extinfo \
-	--with-mysql-retention --with-mysql-downtime"
-
-	use postgres && myconf="${myconf} --with-pgsql-xdata \
-	--with-pgsql-status --with-pgsql-comments --with-pgsql-extinfo \
-	--with-pgsql-retention --with-pgsql-downtime"
-
-	use perl && myconf="${myconf} --enable-embedded-perl --with-perlcache"
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-		emake all || die "make failed"
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-	if use gd; then
-		make DESTDIR=${D} fullinstall install-config || 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
-	else
-		make DESTDIR=${D} fullinstall install-config || die
-		rm -rf ${D}/usr/nagios/{sbin,share}/*
-	fi
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-	insinto /etc/nagios
-	doins ${S}/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/*
-}
-
-pkg_preinst() {
-	einfo "Sample config files installed by default will always"
-	einfo "include cgi.cfg"
-	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/archives
-	chown -R nagios:nagios ${D}/var/nagios || die "Failed Chown of ${D}/var/nagios"
-	keepdir /var/nagios/rw
-	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-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
-	if use gd; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling"
-		if use apache2; then
-			einfo "To have nagios visable on the web, please do the following:"
-			einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-			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 "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 "The Apache config file for nagios will be in"
-			einfo "/etc/apache/conf/addon-modules/ with the name of"
-			einfo "nagios.conf."
-		fi
-		einfo
-		einfo "That will make nagios's web front end visable via"
-		einfo "http://localhost/nagios/"
-		einfo
-	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 gd; then
-		if use apache2; then
-			einfo "Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		fi
-		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-r6.ebuild b/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
deleted file mode 100644
index db06fab0d17c..000000000000
--- a/net-analyzer/nagios-core/nagios-core-1.1-r6.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# 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.1-r6.ebuild,v 1.16 2004/08/10 09:48:14 eldad Exp $
-
-inherit eutils
-
-MY_P=${P/-core}
-DESCRIPTION="Nagios core - Host and service monitor cgi, docs etc..."
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
-IUSE="noweb mysql postgres perl debug apache2"
-
-DEPEND="virtual/mailx
-	!noweb? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-
-		apache2? ( >=net-www/apache-2.0.43-r1 )
-		!apache2? ( <net-www/apache-2 )
-	)
-
-	perl? ( >=dev-lang/perl-5.6.1-r7 )
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	postgres? ( >=dev-db/postgresql-7.3.2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# If there's a gd lib on the system, it will try to build with it.
-	# check if gdlib-config is on, and then check its output.
-	if [[ -x /usr/bin/gdlib-config ]]; then
-		if [[ ! $(gdlib-config --libs | grep -- -ljpeg) ]]; then
-			eerror "Your gd has been compiled without jpeg support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
-	use noweb || epatch ${FILESDIR}/tac.cgi.diff.bz2
-	cp ${FILESDIR}/nagios.cfg-sample.gz ./
-	gunzip nagios.cfg-sample.gz
-}
-
-src_compile() {
-	if use mysql && use postgres; then
-		eerror "Unfortunatly you can't have both MySQL and PostgreSQL enabled at the same time."
-		eerror "You have to remove either 'mysql' or 'postgres' from your USE flags before emerging this."
-
-		has_version ">=sys-apps/portage-2.0.50" && (
-			einfo "You can add:"
-			einfo "net-analyzer/nagios-core [use flags]"
-			einfo "to the file:"
-			einfo "/etc/portage/package.use"
-			einfo "to permamently set this package's USE flags"
-		)
-
-		exit 1
-	fi
-
-	local myconf
-
-	use mysql && myconf="${myconf} \
-		--with-mysql-xdata \
-		--with-mysql-status \
-		--with-mysql-comments \
-		--with-mysql-extinfo \
-		--with-mysql-retention \
-		--with-mysql-downtime"
-
-	use postgres && myconf="${myconf} \
-		--with-pgsql-xdata \
-		--with-pgsql-status \
-		--with-pgsql-comments \
-		--with-pgsql-extinfo \
-		--with-pgsql-retention \
-		--with-pgsql-downtime"
-
-	use perl && myconf="${myconf} \
-		--enable-embedded-perl \
-		--with-perlcache"
-
-	if use debug; then
-		myconf="${myconf} --enable-DEBUG0"
-		myconf="${myconf} --enable-DEBUG1"
-		myconf="${myconf} --enable-DEBUG2"
-		myconf="${myconf} --enable-DEBUG3"
-		myconf="${myconf} --enable-DEBUG4"
-		myconf="${myconf} --enable-DEBUG5"
-	fi
-
-	./configure ${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	make DESTDIR=${D} nagios contrib || die "make failed"
-
-	use noweb || make DESTDIR=${D} cgis # Only compile the CGI's if "noweb" useflag is not set.
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL LICENSE README UPGRADING
-
-	use noweb && (
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-		sed -i -e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due to noweb use flag/' Makefile
-	)
-
-	make DESTDIR=${D} install
-	make DESTDIR=${D} install-config
-	make DESTDIR=${D} install-commandmode
-
-	docinto sample-configs
-	dodoc ${D}/etc/nagios/*
-	rm ${D}/etc/nagios/*
-
-	dodoc ${S}/nagios.cfg-sample
-
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/nagios
-
-	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/*
-}
-
-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
-	if use noweb; then
-		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /dev/null nagios
-}
-
-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:"
-	einfo "  rc-update add nagios default"
-	einfo
-
-	if ! use noweb; then
-		einfo "This does not include cgis that are perl-dependent"
-		einfo "Currently traceroute.cgi is perl-dependent"
-		einfo "To have ministatus.cgi requires copying of ministatus.c"
-		einfo "to cgi directory for compiling."
-
-		einfo "1. Execute the command:"
-		einfo " \"ebuild /var/db/pkg/net-analyzer/${PF}/${PF}.ebuild config\""
-
-		if use apache2; then
-			insinto /etc/apache2/conf/modules.d
-			doins ${FILESDIR}/99_nagios.conf
-
-			einfo " 2. Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			insinto /etc/apache/conf/addon-modules
-			doins ${FILESDIR}/nagios.conf
-			echo "Include  conf/addon-modules/nagios.conf" >> ${ROOT}/etc/apache/conf/apache.conf
-
-			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
-	else
-		einfo "Please note that you have installed Nagios without web interface."
-		einfo "Please don't file any bugs about having no web interface when you do this."
-		einfo "Thank you!"
-	fi
-
-	einfo "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_prerm() {
-	/etc/init.d/nagios stop
-}