updating icinga to 1.9.1 and adding a contrib flag for bug 471174

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 36 insertions, 269 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index eecbeb40127d..2e769add623f 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/icinga
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.38 2013/05/09 21:21:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.39 2013/05/28 08:32:50 prometheanfire Exp $
+
+*icinga-1.9.1 (28 May 2013)
+
+  28 May 2013; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.9.1.ebuild,
+  -icinga-1.8.4.ebuild, -icinga-1.9.0.ebuild, metadata.xml:
+  updating icinga to 1.9.1 and adding a contrib flag for bug 471174
 
 *icinga-1.9.0 (09 May 2013)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 16061d5ff3f3..57f8c0f6336f 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -10,26 +10,25 @@ AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f46
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 936 SHA256 4e978d54b9b5efde1e4474d865d6283eeafa2a57a2ad19ec85a710e79698c456 SHA512 913e923f297281e6a429ac446a20f6b8e8fadbc5dc5b1a01f1b5d73694ebd43e0931e655194593c8335bfc6505bb47b7321b8d6530c869f1bd8b262ad030faaa WHIRLPOOL 0da5e0702535cb9e07f98cabfad9f6ce0999d5d7a60e66494ca3d4167537343d3d750d48145856affc43d404318c88b98078a8c08b369c6829f5e68555cb7dc5
 DIST icinga-1.8.4.tar.gz 7459130 SHA256 e1ecbc6c83bb8b2d4d29934182b101f305c8d45873b0cefe452dd913ee5b6de1 SHA512 4112a6ad78cfedf5106998045f12752ff1c6c55eb347e0e86f8c0e1adfaa678a256c43d5362a6a7952d4c868b00a90a812567ac5d5cd01eb98a8e2a8b346f90e WHIRLPOOL fedebccfa3e9dcc657e72525f6c5b0a7e0a5d70e12b7c2e9c2a621ba658c9007f950be45a6ce85a25bf6dd0d2ca0e62ed0939fe9af964694bfddb124ef3057ed
-DIST icinga-1.9.0.tar.gz 17075732 SHA256 c98d74e4f8f94a666b35d11bc550eefe0b617acc52c92497cbc71a4bf9c46622 SHA512 eb83f8aa141470179334e12cb632ea9568991dfa62ebcb93b2cac0663c802ee07705e0d119d0cbf0b75ee139553b0b8b81ee1f70daa89e3501fe2d0b37eb848b WHIRLPOOL 5bb4a8a611e489918c6e0f99d6c0ca3a8da0c2f1e67d88fe26d59aa3063efd4fb0e3235df53ecf67db0957e21dcd02b8d6f1f24f1502be9561acf5a95b4c6013
+DIST icinga-1.9.1.tar.gz 17075758 SHA256 ad4cc505d0b298bac791e295bbc08ab80a6437a1853689bfa708312deea72511 SHA512 a1ef5f24f82c44ac9baacd856b1f8fc1bca4956ce4ed2691aa4a7c058f2dffab6e5f9244954ae7a2f18d0d53b549a37cca145e1d638b1e57ae4619d788ce8cec WHIRLPOOL 758ea6b9015414c20f6c90b04a958ce19f9f0e8986accb3a0d78e82c88c4d9a6d6b7959c9daf3ac9696c1af76ba605fb8f81754953fa030fbf11a5eaf77665c5
 EBUILD icinga-1.8.4-r1.ebuild 7580 SHA256 5e40c76b943a3f814e01eb85ced6909759b0a1f380004487cfe5e5890404f8ac SHA512 a62314e413e355454014b90742b550c7a483bcf5ca5229d801de90b6beecba10452692b1604f52104c0084fcea604c36ec61b31e2ec7bdb981fbf18cf0b75956 WHIRLPOOL e1c6103be0c02714bc5095c94283029e5c303381f090ae06e9f5992386d1fccead00943602e157396972a61ee50306f782f49b82b20913f6c72cbcbf41d8b02c
-EBUILD icinga-1.8.4.ebuild 7446 SHA256 7dfc94f282683b44ce2cc30e2afd7f4fbcbbb232ffd24c21e207336955a2bc40 SHA512 91b14e2035bab8ff76dd0860dcc150cd4890440cdd8436581c52f2e3edd8a8fd1e1e10add3a532ee3f7cd405ddf89dce5fbb50cefa4d077ef1a86e8a53938523 WHIRLPOOL 0f15264adbc823693db3b041e3efb05604e071d7dde5a98f09747112e1f2e3400bae548441d66e461462c6d6c1b874e8af14bcde2618279809cd77a74708dee2
-EBUILD icinga-1.9.0.ebuild 7577 SHA256 bf211cef75ed4f8793d8a29e9f6a0abeacfe6aeaaf04a619b23908870dc0cd35 SHA512 11d6c9009f2998b791ca3d4cf4ea8bcbb7d9ae0ca6084d9410dac03e812738ad1fc8f5a018be43e37604362f2dc7bd10665b11efee4985fde84428a2c437291b WHIRLPOOL 952cf1c9ef40c708868c3dfe91654d04549d0b6d84fe01b0cbbb4a388ed647399fbdb9268b1c3b54c3e3cbee173c45c518b64d11528b31d3f37a46ad49d3af85
-MISC ChangeLog 6800 SHA256 b721a1e0e36c8fa2649ab9aa509692185646d61f3d8209f5bfc3f31a88862a2a SHA512 066257384d1068643001004ec9ac95ee64d4e6eb6396c603bf78c86dd12415403fa9ff4b7b79681f34eeaec3466f75973653253c7929272a7e7285e280aa4b20 WHIRLPOOL 389f15fde48b7c4186e2f90dfd53ec9e43b4ada4c3adfc95c527c199d0d737e13117edfb7b787d192ffbb3fa42a9a80c3d4627f4cbd67098f565851c96258eb1
-MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
+EBUILD icinga-1.9.1.ebuild 7731 SHA256 e5f4b345225b0587c77629f2f60796f152b53e4cf40bb092f1d3f933f8565b3f SHA512 792498024fed1ca9cbdc4fd65adcf3ad58868e5b9d9a033cd3e69fd52ad5274ccb856235618e767e9bf80721b30744902b29d7e2d6146cfbced3e61764e60520 WHIRLPOOL 235715f44bd403d927a88cde9c727aad41e77e6e0f2d773308a8e3c77094d73f80543c147cd1344d815df5b75712134f8b8d4a4f24addc204d08951bf906bc17
+MISC ChangeLog 7037 SHA256 a742d85a37fcd79695140f684481eb716752f1a56daf8a1c2f34c1ddf4e4bcad SHA512 0eec17b8733bb9848be0f6138f2dbdf4f1dcffa3eca650c2c8b02429ceeb81d8de6cdbedb9f8489fd30c586a89f346fbcd24beb8819b6600dee3d8b75299c3d1 WHIRLPOOL f71a62ccbc90146d016ea350f0732c79847555c9dc5dd41d3e327ff0eec1aa53d56f0c613188d5811617724be182d024ddd58cd28a198f0e536835d67d6df438
+MISC metadata.xml 705 SHA256 6433fd0f1d22d5abb31534b5e8b0804dcfec87e5f385b1a8726a9dba818233e0 SHA512 19385ac0dceb5319793c492b4687a0ce4b9fc6e00dc0aa76efa54280d8901f9738fdafd8c307a394aab89ca6c1aac03092b99c512dd1dc47241fe7db08f074d1 WHIRLPOOL 9e0341411d01328e4243d4db6342e0df648a56b648520cb68987f04432a7a59556fa5dfa1770b461668bf3692d5ffff0377b551c5680be607d9d8d2cae010efc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRjBOnAAoJECRx6z5ArFrD1cQQANWxJP+wqkjlGUPRK9kex9x3
-jSaodt3/r+EnJXZfYAx5a6ffF9pCC8zYYt2tI8wnpasZmcZn2xevK/ytOU6GqRMj
-DswkPqMmcacL7wtgKaw4yH2VkcBQxZzHoHGuhOI/vmFyYetdWM26nd7drYB79QPc
-QQFyRWx4vIxaFZILc8aS2KxfS+wyRUzL/hqz1H8D1TLuFtTyUck6OjGcLl1aOi9G
-mUpBvNRpLoS4POUSr8lP9XGLY2tOwy3OdfHVl4eVWcHi7LfG8W9Il95k1fY24D18
-5LRkBucjvBZ+7HBYfmBg7IY0gkZxjuZuOHJx34tauZRxdQ11XolTglxNeyx4+7MC
-5Wr4L2wMRNe/7s5mipSR3/4yFTHQzV+oX6l9Y6NPh+PhG7403svI+81J6E31mawv
-DmjX12Ic6WPn3DP8oh6P38MPAtb+ISokoZf4Ur0YfMtt+B2KBU58MDYbcutTT+hA
-PkodkVyQ5khd8WRJ6EqnUeU44LHxO5zA5Nfu9EK2x8pc0WCP+4IsXcbNzgFEALsz
-HIcViUc/LK7LBd6uTI7JTkA7MmuDFyC3xOIvhzU7jG9JnDq03Y07BXSW+AfLToQD
-j82i0por+bdhwQnw5jdJ3vyJO1Tz8gPn1Y0dtEYdtauJEszjDRg8QQgENAumopH2
-8UkJqeyLd3U3HU81zu8F
-=bMTQ
+iQIcBAEBCAAGBQJRpGwAAAoJECRx6z5ArFrDLTEQAK4Fv2E4S3fW5du52YyQM629
+dcZJCZhuRp+/BpgJQrvbAWcKiEbC0yqDoSJNhHQw369u1NAMGQc1HODV5vuxLAzE
+6mwnNscXK6Tz+e1dfrEKEat16ZQnEDWzXhqtODj5RxnMr/s9DsRqnY3FFWsA35Ge
++go3jOz5N+NC7q86oh1+QrPcTFZUyJ7agpSBHASmqk9raTEi7uNoZyREWqJ40q9z
+exClFoC0jHxS4nzn0jmLZ74VnpiaAozTqd3NuXG+WgbAeRxAqP75tLHmdWz8AwFZ
+EGzXblUiwvo5isBOBTqu1rqKQq+A0qqouN8obB/0DduGnAcz/Rm0zPwI/dlPeZ8L
+rXuYV+F9XFuwt80xy88NuQyib8sTOZqBvfySvc9S58OBgn94v9/eOdvi/boxgNo7
+GIYyat6Q/3YAc28V5Tc9rbIEr3c4hGWV9EZtiIg01S/QR7c/LY4Au+b7xWz5EUzf
+az3I0HY1+/DoA2hO+kHnvbdodNEM/D4GfbmK0wlw9DO2M0plTmsk+NscWKKJgNuA
+J75r67ODz8ocH1MgX40vutoaeK1j6WlZZROg4jKQqEBNEjfy/K2Fg+RnnyuSKp4Q
+8UeqwSoBJDiyDNxqDEtGFqvuWLjBKV07EQS7k8WmyfKwWOh30UTUDRDrM8eodcHD
+uRC5PO4x1BKn24Gm1F1Q
+=lFXf
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/icinga-1.8.4.ebuild b/net-analyzer/icinga/icinga-1.8.4.ebuild
deleted file mode 100644
index f0cc491b1b0b..000000000000
--- a/net-analyzer/icinga/icinga-1.8.4.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.8.4.ebuild,v 1.1 2013/01/14 21:40:35 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 ~hppa ~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
-
-	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"
-			ewarn "update your db with the scripts under the directory"
-			ewarn "/usr/share/icinga/contrib/db/"
-		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
-}
diff --git a/net-analyzer/icinga/icinga-1.9.0.ebuild b/net-analyzer/icinga/icinga-1.9.1.ebuild
index 9131cf9f2440..2ed33e8bbb50 100644
--- a/net-analyzer/icinga/icinga-1.9.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.0.ebuild,v 1.1 2013/05/09 21:21:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.9.1.ebuild,v 1.1 2013/05/28 08:32:50 prometheanfire Exp $
 
 EAPI=2
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+apache2 eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
+IUSE="+apache2 contrib 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
@@ -49,7 +49,7 @@ src_configure() {
 	$(use_with perl perlcache)
 	$(use_enable idoutils)
 	$(use_enable ssl)
-	--disable-statuswrl
+	--disable-statusurl
 	--with-cgiurl=/icinga/cgi-bin
 	--with-log-dir=/var/log/icinga
 	--libdir=/usr/$(get_libdir)
@@ -102,6 +102,10 @@ src_compile() {
 		emake DESTDIR="${D}" cgis || die
 	fi
 
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib || die
+	fi
+
 	if use idoutils ; then
 		emake DESTDIR="${D}" idoutils || die
 	fi
@@ -120,6 +124,10 @@ src_install() {
 		 emake DESTDIR="${D}" install-idoutils || die
 	fi
 
+	if use contrib ; then
+		emake DESTDIR="${D}" -C contrib install || die
+	fi
+
 	if use eventhandler ; then
 		emake DESTDIR="${D}" install-eventhandlers || die
 	fi
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index 476a6f0d37ed..fb469ac28b7e 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
 	<use>
+		<flag name="contrib">additional scripts</flag>
 		<flag name="idoutils">Adds DB support</flag>
 		<flag name="lighttpd">Adds Lighttpd support</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>