Apache 1.X masking (fix ebuilds to not require apache-1*).

(Portage version: 2.1.2.7)

8 files changed, 49 insertions, 99 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index 7f7bfc348764..9ec5572e85a1 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.98 2007/05/08 21:36:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.99 2007/05/12 04:01:57 chtekk Exp $
+
+  12 May 2007; Luca Longinotti <chtekk@gentoo.org> nagios-core-1.4.1.ebuild,
+  nagios-core-1.4.1-r1.ebuild, nagios-core-2.3.1-r1.ebuild,
+  nagios-core-2.4-r1.ebuild, nagios-core-2.5-r1.ebuild,
+  nagios-core-2.8.ebuild, nagios-core-2.9.ebuild:
+  Apache 1.X masking (fix ebuilds to not require apache-1*).
 
   08 May 2007; Tobias Scherbaum <dertobi123@gentoo.org> files/nagios,
   nagios-core-2.9.ebuild:
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
index b79130c63650..5f7ac56319c0 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1-r1.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb mysql postgres perl debug apache2"
+IUSE="noweb mysql postgres perl debug"
 
 DEPEND="virtual/mailx
 	!noweb? (
@@ -176,13 +176,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios
 			for cgi in `find contrib/ -name "*.cgi" -maxdepth 1` ; do
@@ -226,11 +222,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
index fbb624838397..335ea3c8fb50 100644
--- a/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4.1.ebuild,v 1.7 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.4.1.ebuild,v 1.8 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
-IUSE="noweb mysql postgres perl debug apache2"
+IUSE="noweb mysql postgres perl debug"
 
 DEPEND="virtual/mailx
 	!noweb? (
@@ -176,13 +176,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios
 			for cgi in `find contrib/ -name "*.cgi" -maxdepth 1` ; do
@@ -226,11 +222,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild
index 833456dbfb40..98e021d76f2f 100644
--- a/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.3.1-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.3.1-r1.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
+IUSE="noweb perl debug"
 # mysql postgres
 DEPEND="virtual/mailx
 	!noweb? (
@@ -142,13 +142,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios ; dosbin contrib/traceroute.cgi
 		fi
@@ -189,11 +185,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild
index 88187c7af9e2..d00a2d18a025 100644
--- a/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.4-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.4-r1.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
+IUSE="noweb perl debug"
 # mysql postgres
 DEPEND="virtual/mailx
 	!noweb? (
@@ -142,13 +142,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios ; dosbin contrib/traceroute.cgi
 		fi
@@ -189,11 +185,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild b/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild
index 1024097f854f..2755fafcd77e 100644
--- a/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.5-r1.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.5-r1.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
+IUSE="noweb perl debug"
 # mysql postgres
 DEPEND="virtual/mailx
 	!noweb? (
@@ -142,13 +142,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios ; dosbin contrib/traceroute.cgi
 		fi
@@ -189,11 +185,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-2.8.ebuild b/net-analyzer/nagios-core/nagios-core-2.8.ebuild
index 1d7f69d35cdd..b59284027c85 100644
--- a/net-analyzer/nagios-core/nagios-core-2.8.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.8.ebuild,v 1.2 2007/04/22 10:19:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.8.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
+IUSE="noweb perl debug"
 # mysql postgres
 DEPEND="virtual/mailx
 	!noweb? (
@@ -142,13 +142,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios ; dosbin contrib/traceroute.cgi
 		fi
@@ -189,11 +185,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"
diff --git a/net-analyzer/nagios-core/nagios-core-2.9.ebuild b/net-analyzer/nagios-core/nagios-core-2.9.ebuild
index d8f5a20e5390..d6c0e616f644 100644
--- a/net-analyzer/nagios-core/nagios-core-2.9.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.9.ebuild,v 1.2 2007/05/08 21:36:14 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.9.ebuild,v 1.3 2007/05/12 04:01:57 chtekk Exp $
 
 inherit eutils apache-module toolchain-funcs gnuconfig
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="noweb perl debug apache2"
+IUSE="noweb perl debug"
 # mysql postgres
 DEPEND="virtual/mailx
 	!noweb? (
@@ -138,13 +138,9 @@ src_install() {
 
 	# Apache Module
 	if use !noweb; then
-		if use apache2; then
-			insinto ${APACHE2_MODULES_CONFDIR}
-			doins ${FILESDIR}/99_nagios.conf
-		else
-			insinto ${APACHE1_MODULES_CONFDIR}
-			doins ${FILESDIR}/nagios.conf
-		fi
+		insinto ${APACHE2_MODULES_CONFDIR}
+		doins ${FILESDIR}/99_nagios.conf
+
 		if use perl; then
 			into /usr/nagios ; dosbin contrib/traceroute.cgi
 		fi
@@ -185,11 +181,7 @@ pkg_postinst() {
 		einfo "To have ministatus.cgi requires copying of ministatus.c"
 		einfo "to cgi directory for compiling."
 
-		if use apache2; then
-			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-		else
-			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-		fi
+		einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 
 		einfo
 		einfo "That will make nagios's web front end visable via"