removed the unneeded dep on php

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 270 insertions, 15 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 2260542f08d9..e809a0651dfb 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.19 2012/07/09 20:44:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.20 2012/08/17 20:53:12 prometheanfire Exp $
+
+*icinga-1.7.1-r3 (17 Aug 2012)
+
+  17 Aug 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r3.ebuild:
+  adding icinga-1.7.1-r3.ebuild to remove the php dep
 
 *icinga-1.7.1-r2 (09 Jul 2012)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 8d57c2d8b588..ba7ca5f378a5 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -16,23 +16,24 @@ EBUILD icinga-1.6.1-r2.ebuild 6961 SHA256 1b59c64f2906d8b12a39fce9539b558c9673be
 EBUILD icinga-1.7.0.ebuild 7640 SHA256 135b22cbf63b7c2c2e28ef7bfaedf72feb2c5270e610446478358b9255aa4322 SHA512 e077cb01a97086d4ca82411b5e357d588abed9376ce56ebd084de20f2540759d1af53c97b876606699d8ab39a57f7161569a2385ce64dcf9de21fd3ff8de893c WHIRLPOOL f55b6a07ee235cf396edb0b9d468cdee38b96a22236a67a5d6eb59c1fc27d53eff6f0fe2d409d3d48f8b3d0c2db486439bfb89a7998f952910bd130c8829e449
 EBUILD icinga-1.7.1-r1.ebuild 7666 SHA256 fa0cc628698915ae6294ac744a88b3f5a2bb2d6d4ef7e02bce98cff4121ade8f SHA512 b1bf002f703730223f56e8fa38598faf994847843ab4edf91621aac2a28f3848324aced96394cc9d1c289bae1af9f5e6922097f0e7929a210ea855081764fcf6 WHIRLPOOL 09070f27b731f693a6cff86aa99c7c91961a9433d3a7f353915739be8a8dbe412f16c441419699994b0ed0a94a2763deaf2aec009fa2bd0be1cd9a8edde2c223
 EBUILD icinga-1.7.1-r2.ebuild 7496 SHA256 94d47dcc1ef907f554f4f026bc5232dedf8e40648c494ca73c79d223a3578e42 SHA512 0acb3794202b6dc02a6fdc368e2fbea96fc31618c4098ffcbb0148afe6cede89d912460fcc97fd1cf817bb42464573151d782fdc231aea6844d6369f3286c310 WHIRLPOOL d5d854dd83f3ff0dee5ae88f28127a9e07c921e72ad69e635b4da04bbf9049ff5046806f664198bbc611352ffddc0c12f3732e3cd33c6b39ea6d95f1fb200c9a
+EBUILD icinga-1.7.1-r3.ebuild 7416 SHA256 5938074d0d8237d052eda2ff4d25c57e545d8a54767c2ee046c7c83555d487d9 SHA512 2667851e4e946467701c74c614b2eb8180505dead11f9044dc9a75dfb3411c96f69b7b34dad0b1b1dfcb6cbde7de12cea0d42eddcaf0c3bc8be1dce33dac0994 WHIRLPOOL 0d1c6f7b21d5f9edf6ef4dd80179fc12579d8e468bf44243594640c5b20217abe1e4a3a540beffd961f88fa015c99ad6de6371a8a745beaabdf2439c3adb81c7
 EBUILD icinga-1.7.1.ebuild 7647 SHA256 76895ac1a959bfdfeaf8334ea1808002928faec451172a3eef2e799bc3c685b2 SHA512 c76dd74a308fc76899b72c8ce2f837c66ec6f9bbfc60b744b3ba8b19d834554fdd8f30f961369ec009170408496645dbdddb9e186cb5f474718b6f232e5c1c37 WHIRLPOOL 06ec938d1cd332c59ce6aab4b9d0a9db14c0f89f83f8acfcc7557df84cc592e888bb88effd85d9362c469a4f10240e66566082049d6e6a1d02a1d1120040fa27
-MISC ChangeLog 3692 SHA256 41a058c537907f581ce8ec15b6bc4555fb5615c27e95b527a3b2fb447e00a72e SHA512 91c94fe01545bd5a86f0f4465e27738fc2465f900d62e8d1d9a3064abac64cb3273084ddf76c32dcc1bf5471dc09894bd253502f49bea5ca591a92dd31e137d7 WHIRLPOOL ec614bab39a6bb7e397a2043e0eb833f2649c493dce080f6f157d81f0ab2524dbf3a43d7dda0c557ea308abded3f88fe7fad0e260dd30933e8d62139e3f58004
+MISC ChangeLog 3863 SHA256 e97eb17d2bac6e4a7e5cfb66a32eef6d4d0f599dadd8d7a69fffde097589a7b5 SHA512 ff2d24ff2ddba69cf49770d1b7cf2fe291603a0f4e58f46ff5963e9f429db786d69e6dd8decc568af3af852d8bdfb300972b1e4c7e45279119f55d9f241d0a68 WHIRLPOOL 9bfef64b6b6eb73cae3fced4192843c659255cbe71681609a4ff2a942f25a98291983a5fd1f8a1c11ffd645ceca9994ef408db01b0a07aed510391053f5b2a1b
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP+0LDAAoJECRx6z5ArFrDeP8P/iD8YmjPm0oAukVNzaUT87hr
-qO/HR+p9qKXHMCSF+di3WU/vDgr1UWsYgt6A+EDZ2Gt4/znRvkMLzwyW71pS+qD/
-O9mdHgcirzJ8b2n/wdgLmAH/2ysgy71+ih+MJ/4iLWBVr+4uOuvSLFCQw1V+DbJ7
-EnwZVbw/JlpQdefDg5RItRejCrnLKs8LPkdDHACBJ2W0jScBPLcBOaoiZz0jfUtR
-DUUiBRgjMgNbDk9r4/IsYAjQ4NWe4+Mh5493S6kz3g+Pl0PumAbqoPiFz/0vKkrd
-3hP9Ru++Pi454cgYqVDPR+GUWnGcBkmawYf/lCpaalRc6L0Qg7cDgcOvEV7fjzut
-ajjr6+7JzC2w4yls4LL9MeqSHZPA9VIiQKtUsBinSE2QNsryxqUuJGXQUHVDMdIH
-ix3suM2Wypra4rJpwYvEdqHIrXvcmHpvAJ173l/nbVJAxpeLtM4wkVVzFqGlhM/v
-QYoCNSMOOcEvOvrs/n6moBpC4ooHJkr+pZ83aHwnAa5YLHiwcayKKQS3n66t1x0P
-ogE1nzZcBO2IrC/rFlza7uNIL7c2xhJH0wxLEC9BWcH03WLihqhQieMEb/4r4B1g
-7cCOrKj5MLwY+sPL7kOzDBDFO4CF5IsAicthY1oxAi70GrXZ2gYEXI5QtO+5+Axb
-fM4oDwqtBhLX5eHZrKLP
-=75ag
+iQIcBAEBAgAGBQJQLq9KAAoJECRx6z5ArFrDOBEP/2bzDlt0Y/a5ifjNWXY84YCe
+KpDje7wXinrmH9ug2w3XUlp0kseQ5PKc6036jhxAD2atGjdKtoK2aDsUHGQFid6R
+7ScmKV/Je3dIZZx/vYojR3D4FMxUI9rniyOoAFSMvlOlwfBDCs3Ldsk7DjI5oex3
+GMnFraYZAAQB48uFTDMVsE0MDDQRNljpGaxwbAEkcyzjE+7Nc0HiNl+zpdNpyR+J
+5SoBOVMFNgL9bPwVRwVnSf+GsFCInb1fpk4p5ZrMeVeAFW0FeyLUvS04Axy/xgzI
+II5fIRnRRIi5Bu8COq3SMMEYVk0TJAuap/lkcevHz78dv2r7OgVJKeaKzjgYUd/d
++oZBCrTfuZqKopF8K5lxMY+lJyjxqTo1IIctjDfMjLicuovxkKvNph9CRsMzyMap
+CiNiTDbLn3iKmtPKdeiMf6w6orXFnb0B+agjDHQWfBK0dPncLT7IJjQrgt2SckDj
+wXhM0Qx5V31jt6XDELJZiZQqQXWqGurZm3lCiPsqcYHLqchtNeZvtbdJ4iYKvrJV
+nO71vGYVyjDNyF36Mx4gzOo+bNcFiov+n8tDDJX2hR89p2V0nh7q/AeB6/jFrFM0
+b+xYU1eoxTWtBguXgoDK82ruGZEztEx8pUP+zIVCSkxCRvjBiKbC1QrpwEdxOK3I
+qdJz5LE6DyLhdsJLKzow
+=ncZK
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.7.1-r3.ebuild b/net-analyzer/icinga/icinga-1.7.1-r3.ebuild
new file mode 100644
index 000000000000..dc5ab774657a
--- /dev/null
+++ b/net-analyzer/icinga/icinga-1.7.1-r3.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.1-r3.ebuild,v 1.1 2012/08/17 20:53:12 prometheanfire Exp $
+
+EAPI=2
+
+inherit depend.apache eutils multilib toolchain-funcs user versionator
+
+DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
+HOMEPAGE="http://www.icinga.org/"
+#MY_PV=$(delete_version_separator 3)
+#SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+#S=${WORKDIR}/${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+apache2 eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
+	perl? ( dev-lang/perl )
+	virtual/mailx
+	web? (
+		media-libs/gd[jpeg,png]
+		lighttpd? ( www-servers/lighttpd )
+	)
+	!net-analyzer/nagios-core"
+RDEPEND="${DEPEND}
+	plugins? ( net-analyzer/nagios-plugins )"
+RESTRICT="test"
+
+want_apache2
+
+pkg_setup() {
+	depend.apache_pkg_setup
+	enewgroup icinga
+	enewgroup nagios
+	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
+}
+
+src_configure() {
+	local myconf
+
+	myconf="$(use_enable perl embedded-perl)
+	$(use_with perl perlcache)
+	$(use_enable idoutils)
+	$(use_enable ssl)
+	--disable-statuswrl
+	--with-cgiurl=/icinga/cgi-bin
+	--with-log-dir=/var/log/icinga
+	--libdir=/usr/$(get_libdir)
+	--bindir=/usr/sbin
+	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+	--datarootdir=/usr/share/icinga/htdocs
+	--localstatedir=/var/lib/icinga
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga
+	--with-temp-file=/tmp/icinga/icinga.tmp"
+
+	if use idoutils ; then
+		myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock
+		--with-icinga-chkfile=/var/lib/icinga/icinga.chk
+		--with-ido-sockfile=/var/lib/icinga/ido.sock
+		--with-idomod-tmpfile=/tmp/icinga/idomod.tmp"
+	fi
+
+	if use eventhandler ; then
+		myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers"
+	fi
+
+	if use plugins ; then
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	else
+		myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins"
+	fi
+
+	if use !apache2 && use !lighttpd ; then
+		myconf+=" --with-command-group=icinga"
+	else
+		if use apache2 ; then
+			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
+			myconf+=" --with-command-group=apache"
+		elif use lighttpd ; then
+			myconf+=" --with-command-group=lighttpd"
+		fi
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+
+	emake icinga || die "make failed"
+
+	if use web ; then
+		emake DESTDIR="${D}" cgis || die
+	fi
+
+	if use idoutils ; then
+		emake DESTDIR="${D}" idoutils || die
+	fi
+}
+
+src_install() {
+	dodoc Changelog README UPGRADING || die
+
+	if ! use web ; then
+		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
+	fi
+
+	emake DESTDIR="${D}" install{,-config,-commandmode} || die
+
+	if use idoutils ; then
+		 emake DESTDIR="${D}" install-idoutils || die
+	fi
+
+	if use eventhandler ; then
+		emake DESTDIR="${D}" install-eventhandlers || die
+	fi
+
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
+	if use idoutils ; then
+		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		newconfd "${FILESDIR}"/ido2db-conf.d ido2db || die
+		insinto /usr/share/icinga/contrib/db
+		doins -r module/idoutils/db/* || die
+	fi
+	# Apache Module
+	if use web ; then
+		if use apache2 ; then
+			insinto "${APACHE_MODULES_CONFDIR}"
+			newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf || die
+		elif use lighttpd ; then
+			insinto /etc/lighttpd
+			newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf || die
+		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
+		fowners -R root:root /usr/$(get_libdir)/icinga || die
+		cd "${D}" || die
+		find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} +
+		find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} +
+	fi
+
+	if use eventhandler ; then
+		dodir /etc/icinga/eventhandlers || die
+		fowners icinga:icinga /etc/icinga/eventhandlers || die
+	fi
+
+	dodir /var/run/icinga || die
+	fowners icinga:icinga /var/run/icinga || die
+
+	keepdir /etc/icinga
+	keepdir /var/lib/icinga
+	keepdir /var/lib/icinga/archives
+	keepdir /var/lib/icinga/rw
+	keepdir /var/lib/icinga/spool/checkresults
+
+	if use apache2 ; then
+		webserver=apache
+	elif use lighttpd ; then
+		webserver=lighttpd
+	else
+		webserver=icinga
+	fi
+
+	fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
+	fowners -R icinga:${webserver} /var/lib/icinga/rw || die "Failed chown of /var/lib/icinga/rw"
+
+	fperms 6755 /var/lib/icinga/rw || die "Failed Chmod of ${D}/var/lib/icinga/rw"
+	fperms 0750 /etc/icinga || die "Failed chmod of ${D}/etc/icinga"
+}
+
+pkg_postinst() {
+	if use web ; then
+		elog "This does not include cgis that are perl-dependent"
+		elog "Currently traceroute.cgi is perl-dependent"
+		elog "Note that the user your webserver is running as needs"
+		elog "read-access to /etc/icinga."
+		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 icinga apache"
+				elog "or"
+				elog "	chown icinga:apache /etc/icinga"
+				elog
+				elog "Also edit /etc/conf.d/apache2 and add a line like"
+				elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\""
+				elog
+				elog "Icinga web service needs user authentication. If you"
+				elog "use the base configuration, you need a password file"
+				elog "with a password for user \"icingaadmin\""
+				elog "You can create this file by executing:"
+				elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin"
+			elif use lighttpd ; then
+				elog "  usermod -G icinga lighttpd "
+				elog "or"
+				elog "  chown icinga:lighttpd /etc/icinga"
+				elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'"
+			fi
+			elog
+			elog "That will make icinga's web front end visable via"
+			elog "http://localhost/icinga/"
+			elog
+		else
+			elog "IMPORTANT: Do not forget to add the user your webserver"
+			elog "is running as to the icinga group!"
+		fi
+	else
+		ewarn "Please note that you have installed Icinga without web interface."
+		ewarn "Please don't file any bugs about having no web interface when you do this."
+		ewarn "Thank you!"
+	fi
+	elog
+	elog "If you want icinga to start at boot time"
+	elog "remember to execute:"
+	elog "  rc-update add icinga default"
+	elog
+	elog "If your kernel has /proc protection, icinga"
+	elog "will not be happy as it relies on accessing the proc"
+	elog "filesystem. You can fix this by adding icinga into"
+	elog "the group wheel, but this is not recomended."
+	elog
+	if [ -d "${ROOT}"/var/icinga ] ; then
+		ewarn
+		ewarn "/var/icinga was moved to /var/lib/icinga"
+		ewarn "please move the files if this was an upgrade"
+		if use idoutils ; then
+			ewarn "and edit /etc/ido2db.cfg to change the location of the files"
+			ewarn "it accesses"
+		fi
+		ewarn
+		ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files"
+		ewarn "remove /var/icinga afterwards to make this warning disappear"
+	fi
+}