Use get_libdir & clean old versions

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 x86_64)

4 files changed, 10 insertions, 467 deletions

diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index c8115c8fa188..e870df3941a6 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-core
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.126 2008/06/25 18:39:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.127 2008/06/27 20:03:52 dertobi123 Exp $
+
+  27 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -nagios-core-2.11.ebuild, -nagios-core-3.0.2.ebuild,
+  nagios-core-3.0.3.ebuild:
+  Use get_libdir & clean old versions
 
 *nagios-core-3.0.3 (25 Jun 2008)
 
diff --git a/net-analyzer/nagios-core/nagios-core-2.11.ebuild b/net-analyzer/nagios-core/nagios-core-2.11.ebuild
deleted file mode 100644
index 2a0e0b5757e1..000000000000
--- a/net-analyzer/nagios-core/nagios-core-2.11.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2008 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.11.ebuild,v 1.4 2008/03/22 15:37:39 armin76 Exp $
-
-EAPI="1"
-
-inherit eutils depend.apache toolchain-funcs
-
-MY_P=${PN/-core}-${PV/_}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
-	mirror://gentoo/nagios-2.0b.cfg-sample.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ppc64 sparc x86"
-IUSE="debug perl +web vim-syntax"
-DEPEND="virtual/mailx
-	web? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		perl? ( net-analyzer/traceroute )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Check if gd has been compiled with jpeg and png support
-	if use web; then
-		if ! built_with_use media-libs/gd jpeg png; then
-			eerror "Your gd has been compiled without jpeg and/or png support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg png" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/2.x-series-nsca.patch
-
-	local strip="$(echo '$(MAKE) strip-post-install')"
-	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_compile() {
-	local myconf
-
-	if use perl
-	then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	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
-
-	if use apache2 ; then
-		myconf="${myconf} --with-command-grp=apache"
-	else
-		myconf="${myconf} --with-command-grp=nagios"
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr/nagios \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--datadir=/usr/nagios/share \
-		|| die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use web ; then
-		# Only compile the CGI's if "web" useflag is set.
-		make CC=$(tc-getCC) DESTDIR="${D}" cgis || die
-	fi
-
-	emake -C contrib all || "contrib make filed"
-
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL README UPGRADING
-	docinto contrib
-	dodoc contrib/README
-
-	if ! use web; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' 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/*
-
-	newdoc "${WORKDIR}"/nagios-2.0b.cfg-sample nagios.cfg-sample
-
-	#contribs are not configured by the configure script, we'll configure them overselves...
-	find "${S}"/contrib/ -type f | xargs sed -e 's:/usr/local/nagios/var/rw:/var/nagios/rw:;
-						s:/usr/local/nagios/libexec:/usr/nagios/libexec:;
-						s:/usr/local/nagios/etc:/etc/nagios:;
-						s:/usr/local/nagios/sbin:/usr/nagios/sbin:;' -i
-
-	insinto /usr/share/doc/${PF}/contrib
-	doins -r contrib/eventhandlers
-
-	doinitd "${FILESDIR}"/nagios
-
-	chmod 644 "${S}"/contrib/*.cgi
-	into /usr/nagios
-	for bin in `find contrib/ -type f -perm 0755 -maxdepth 1` ; do
-		dobin "$bin"
-	done
-
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			doins "${FILESDIR}"/99_nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports apache-2.x webserver"
-			ewarn "out-of-the-box. Since you are not using apache, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-
-		if use perl; then
-			into /usr/nagios ; dosbin contrib/traceroute.cgi
-		fi
-	fi
-
-	for dir in etc/nagios var/nagios ; do
-		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
-	done
-
-	chown -R root:root "${D}"/usr/nagios
-	find "${D}"/usr/nagios -type d -print0 | xargs -0 chmod 755
-	find "${D}"/usr/nagios/*bin -type f -print0 | xargs -0 chmod 755
-	find "${D}"/usr/nagios/share -type f -print0 | xargs -0 chmod 644
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /usr/nagios/share/ssi
-	keepdir /var/nagios/rw
-
-	if use apache2 ; then
-		chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	else
-		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
-	fi
-
-	chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-
-	cat << EOF > "${T}"/55-nagios-core-revdep
-SEARCH_DIRS="/usr/nagios/bin /usr/nagios/libexec"
-EOF
-
-	insinto /etc/revdep-rebuild
-	doins "${T}"/55-nagios-core-revdep
-}
-
-pkg_postinst() {
-	elog
-	elog "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
-	elog
-	elog "Also, if you want nagios to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add nagios default"
-	elog
-
-	if use web; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "To have ministatus.cgi requires copying of ministatus.c"
-		elog "to cgi directory for compiling."
-
-		elog "Note that the user your webserver is running at needs"
-		elog "read-access to /etc/nagios."
-		elog
-
-		if use apache2 ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog "	usermod -G nagios apache"
-			elog "or"
-			elog "	chown nagios:apache /etc/nagios"
-			elog
-			elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-			elog
-			elog "That will make nagios's web front end visable via"
-			elog "http://localhost/nagios/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the nagios group!"
-		fi
-
-	else
-		elog "Please note that you have installed Nagios without web interface."
-		elog "Please don't file any bugs about having no web interface when you do this."
-		elog "Thank you!"
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-
-	elog
-	ewarn "Use /usr/nagios/bin/convertcfg for configuration file conversion"
-}
-
-pkg_prerm() {
-	[[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.2.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.2.ebuild
deleted file mode 100644
index 94605791fcc7..000000000000
--- a/net-analyzer/nagios-core/nagios-core-3.0.2.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.2.ebuild,v 1.2 2008/05/23 19:24:14 dertobi123 Exp $
-
-EAPI="1"
-
-inherit eutils depend.apache toolchain-funcs
-
-MY_P=${PN/-core}-${PV}
-DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
-HOMEPAGE="http://www.nagios.org/"
-SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug lighttpd perl +web vim-syntax"
-DEPEND="virtual/mailx
-	web? (
-		>=media-libs/jpeg-6b-r3
-		>=media-libs/libpng-1.2.5-r4
-		>=media-libs/gd-1.8.3-r5
-		lighttpd? ( www-servers/lighttpd )
-	)
-	perl? ( >=dev-lang/perl-5.6.1-r7 )"
-RDEPEND="${DEPEND}
-	vim-syntax? ( app-vim/nagios-syntax )"
-
-want_apache2
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	# Check if gd has been compiled with jpeg and png support
-	if use web; then
-		if ! built_with_use media-libs/gd jpeg png; then
-			eerror "Your gd has been compiled without jpeg and/or png support."
-			eerror "Please re-emerge gd:"
-			eerror "# USE="jpeg png" emerge gd"
-			die "pkg_setup failed"
-		fi
-	fi
-
-	enewgroup nagios
-	enewuser nagios -1 /bin/bash /var/nagios/home nagios
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	local strip="$(echo '$(MAKE) strip-post-install')"
-	sed -i -e "s:${strip}::" {cgi,base}/Makefile.in || die "sed failed in Makefile.in"
-}
-
-src_compile() {
-	local myconf
-
-	if use perl ; then
-		myconf="${myconf} --enable-embedded-perl --with-perlcache"
-	fi
-
-	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
-
-	if use !apache2 && use !lighttpd ; then
-		myconf="${myconf} --with-command-grp=nagios"
-	else
-		if use apache2 ; then
-			myconf="${myconf} --with-command-grp=apache"
-			myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
-		elif use lighttpd ; then
-			myconf="${myconf} --with-command-grp=lighttpd"
-		fi
-	fi
-
-	econf ${myconf} \
-		--prefix=/usr \
-		--bindir=/usr/sbin \
-		--sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
-		--datadir=/usr/share/nagios/htdocs \
-		--localstatedir=/var/nagios \
-		--sysconfdir=/etc/nagios \
-		--libexecdir=/usr/$(get_libdir)/nagios/plugins \
-		|| die "./configure failed"
-
-	emake CC=$(tc-getCC) nagios || die "make failed"
-
-	if use web ; then
-		# Only compile the CGI's if "web" useflag is set.
-		emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die
-	fi
-}
-
-src_install() {
-	dodoc Changelog INSTALLING LEGAL README UPGRADING
-
-	if ! use web ; then
-		sed -i -e 's/cd $(SRC_CGI) && $(MAKE) $@/# line removed due missing web use flag/' \
-			-e 's/cd $(SRC_HTM) && $(MAKE) $@/# line removed due missing web use flag/' \
-			Makefile
-	fi
-
-	sed -i -e 's/^contactgroups$//g' Makefile
-
-	emake DESTDIR="${D}" install
-	emake DESTDIR="${D}" install-config
-	emake DESTDIR="${D}" install-commandmode
-
-	newinitd "${FILESDIR}"/nagios3 nagios
-	newconfd "${FILESDIR}"/conf.d nagios
-
-	# Apache Module
-	if use web ; then
-		if use apache2 ; then
-			insinto "${APACHE_MODULES_CONFDIR}"
-			doins "${FILESDIR}"/99_nagios3.conf
-	    elif use lighttpd ; then
-			insinto /etc/lighttpd
-			newins "${FILESDIR}/lighttpd_nagios3.conf" nagios.conf
-		else
-			ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver"
-			ewarn "out-of-the-box. Since you are not using one of them, you"
-			ewarn "have to configure your webserver accordingly yourself."
-		fi
-
-	fi
-
-	for dir in etc/nagios var/nagios ; do
-		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
-	done
-
-	chown -R root:root "${D}"/usr/lib/nagios
-	find "${D}"/usr/lib/nagios -type d -print0 | xargs -0 chmod 755
-	find "${D}"/usr/lib/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
-
-	keepdir /etc/nagios
-	keepdir /var/nagios
-	keepdir /var/nagios/archives
-	keepdir /var/nagios/rw
-	keepdir /var/nagios/spool/checkresults
-
-	if use !apache2 && use !lighttpd; then
-		chown -R nagios:nagios "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-	else
-		if use apache2 ; then
-			chown -R nagios:apache "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-		elif use lighttpd ; then
-			chown -R nagios:lighttpd "${D}"/var/nagios/rw || die "Failed chown of ${D}/var/nagios/rw"
-		fi
-	fi
-
-	chmod ug+s "${D}"/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
-	chmod 0750 "${D}"/etc/nagios || die "Failed chmod of ${D}/etc/nagios"
-}
-
-pkg_postinst() {
-	elog "If you want nagios to start at boot time"
-	elog "remember to execute:"
-	elog "  rc-update add nagios default"
-	elog
-
-	if use web ; then
-		elog "This does not include cgis that are perl-dependent"
-		elog "Currently traceroute.cgi is perl-dependent"
-		elog "To have ministatus.cgi requires copying of ministatus.c"
-		elog "to cgi directory for compiling."
-
-		elog "Note that the user your webserver is running at needs"
-		elog "read-access to /etc/nagios."
-		elog
-
-		if use apache2 || use lighttpd ; then
-			elog "There are several possible solutions to accomplish this,"
-			elog "choose the one you are most comfortable with:"
-			elog
-			if use apache2 ; then
-				elog "	usermod -G nagios apache"
-				elog "or"
-				elog "	chown nagios:apache /etc/nagios"
-				elog
-				elog "Also edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
-			elif use lighttpd ; then
-				elog "  usermod -G nagios lighttpd "
-				elog "or"
-				elog "  chown nagios:lighttpd /etc/nagios"
-			fi
-			elog
-			elog "That will make nagios's web front end visable via"
-			elog "http://localhost/nagios/"
-			elog
-		else
-			elog "IMPORTANT: Do not forget to add the user your webserver"
-			elog "is running as to the nagios group!"
-		fi
-
-	else
-		elog "Please note that you have installed Nagios without web interface."
-		elog "Please don't file any bugs about having no web interface when you do this."
-		elog "Thank you!"
-	fi
-
-	elog
-	elog "If your kernel has /proc protection, nagios"
-	elog "will not be happy as it relies on accessing the proc"
-	elog "filesystem. You can fix this by adding nagios into"
-	elog "the group wheel, but this is not recomended."
-	elog
-}
-
-pkg_prerm() {
-	[[ "${ROOT}" == "/" ]] && /etc/init.d/nagios stop
-}
diff --git a/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild b/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild
index 842ede5fed4b..bce03db0f25f 100644
--- a/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild,v 1.1 2008/06/25 18:39:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-3.0.3.ebuild,v 1.2 2008/06/27 20:03:52 dertobi123 Exp $
 
 EAPI="1"
 
@@ -136,9 +136,9 @@ src_install() {
 		chown -R nagios:nagios "${D}/${dir}" || die "Failed chown of ${D}/${dir}"
 	done
 
-	chown -R root:root "${D}"/usr/lib/nagios
-	find "${D}"/usr/lib/nagios -type d -print0 | xargs -0 chmod 755
-	find "${D}"/usr/lib/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
+	chown -R root:root "${D}"/usr/$(get_libdir)/nagios
+	find "${D}"/usr/$(get_libdir)/nagios -type d -print0 | xargs -0 chmod 755
+	find "${D}"/usr/$(get_libdir)/nagios/cgi-bin -type f -print0 | xargs -0 chmod 755
 
 	keepdir /etc/nagios
 	keepdir /var/nagios