sync with gentoo tree, so I can start working on icinga 1.7

10 files changed, 189 insertions, 88 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index e3fb007..2bed39f 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,14 +1,47 @@
 # 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.5 2011/11/22 19:53:37 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.14 2012/03/09 10:00:55 phajdan.jr Exp $
 
-*icinga-1.6.1-r3 (27 Feb 2012)
+  09 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> icinga-1.6.1-r2.ebuild:
+  x86 stable wrt bug #403949
 
-  27 Feb 2012; mthode <mthode@gentoo.org> +icinga-1.6.1-r3.ebuild:
-  adding API back into the build (should have been statically in it)
+  23 Feb 2012; Agostino Sarubbo <ago@gentoo.org> icinga-1.6.1-r2.ebuild:
+  Stable for amd64, wrt bug #403949
 
-  12 Jan 2012; mthode <mthode@gentoo.org> files/icinga-init.d-2:
-  fixed initscript reload reload
+  20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Drop no-herd.
+
+  08 Jan 2012; mthode <mthode@gentoo.org> files/icinga-init.d-2:
+  fixed the reload function and readded the checkconfig function to the init
+  script
+
+  29 Dec 2011; mthode <mthode@gentoo.org> +icinga-1.6.1-r1.ebuild:
+  readding r1....
+
+*icinga-1.6.1-r2 (29 Dec 2011)
+
+  29 Dec 2011; mthode <mthode@gentoo.org> -icinga-1.6.1-r1.ebuild,
+  +icinga-1.6.1-r2.ebuild:
+  set plugins flag on by default
+
+*icinga-1.6.1-r1 (04 Dec 2011)
+
+  04 Dec 2011; mthode <mthode@gentoo.org> -icinga-1.6.1.ebuild,
+  +icinga-1.6.1-r1.ebuild, files/icinga-init.d-2, files/ido2db-init.d:
+  fixed error in old ido2db-init and updated icinga-init to be in line with new
+  openrc
+
+  03 Dec 2011; mthode <mthode@gentoo.org> -icinga-1.5.1.ebuild,
+  -icinga-1.5.1-r1.ebuild:
+  removed older ebuilds
+
+*icinga-1.6.1 (02 Dec 2011)
+
+  02 Dec 2011; mthode <mthode@gentoo.org> +icinga-1.6.1.ebuild,
+  files/icinga-init.d-2, files/icinga-apache.conf:
+  moved /var/icinga to /var/lib/icinga; init updated to remove redundant config
+  check (done by default now); add icinga to nagios group all the time; moved
+  loging around; removed api use flag
 
   22 Nov 2011; mthode <mthode@gentoo.org> -icinga-1.5.1-r2.ebuild:
   removed icinga-1.5.1-r2.ebuild for init.d error (fix is in r3)
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index b573862..2cb7446 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,14 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX fix-prestripped-binaries.patch 775 RMD160 45828e00c34df96bd808d211e26ccecbb7ef7923 SHA1 3664f9443b5f261d45a3420809f6d688b1a5df03 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957
 AUX icinga-apache.conf 591 RMD160 e2286c2a17869c1dc7e5229ad46ae20e8f9d65a1 SHA1 a52d44d21ea28488838de50a2151b29a341203dd SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df
 AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db
+AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d
 AUX icinga-init.d-2 1267 RMD160 843973fac0562c75c92362aa6f313ba617abe2fd SHA1 af23cfd4f3a911c648aa125bafb873707d4b34b8 SHA256 cfef566114fcfbd53dc3f43f7352b934d33c7a0d62f554dfb0eae352f6e09d01
 AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1 0d74cc2936327121f07b61fb1a348ce66035bfbb SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
-AUX ido2db-init.d 990 RMD160 505b54e4ca4cc7ce4771680837a937c0416d9394 SHA1 a2e733b5b4808e360736f82f47ba3cf88a40cc4c SHA256 9d460516288fb6a43907df8e51392f974ab3ab5c10d7d9ba2297fe7acb024186
-DIST icinga-1.5.1.tar.gz 16518659 RMD160 972d1e4dd49fdddf32970868bd16964c7e3cd87d SHA1 61bd47535e9f49e63e0ee1ef2bb56d62e6893418 SHA256 b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b
+AUX ido2db-init.d 990 RMD160 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
 DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
-EBUILD icinga-1.5.1-r3.ebuild 6840 RMD160 a619b1670b32792f011efe65d4bac172c685a438 SHA1 c009a6d39997bdb5666d0184f4452a4f68727265 SHA256 7dfd94ad786388f8d6a9d732dd654ef5de1fb0ee321622880f16725e25e27c3b
-EBUILD icinga-1.6.1-r3.ebuild 7056 RMD160 d06e230ec69c3bd0df5c8d4d8088334ff09008c7 SHA1 1ee629636a6a25216340437c9adb9707a7aefa9c SHA256 16a2096e32c800f5107333ba6cc719ccc5ab06877a5b7d13ee0f046ef8383374
-EBUILD icinga-1.6.1.ebuild 6963 RMD160 a18fc79282f187a14f7eb40caee44bbf7f02c601 SHA1 a9c071619cfb8e7990aa203881ccd4d3fb0d4f5e SHA256 35437f349927e334cab3a824072dd93edbf6721ebd48091d4c38c613e92d93d3
-MISC ChangeLog 1531 RMD160 92a982a934275a38a0e8b559dab10de35e2d25bb SHA1 de93dbf1e18dfee1b00c47b23e3d68f3c078a72a SHA256 d4921b473368eb142816442114347176b410823974e180e3ab7c0660ee8e3f29
-MISC metadata.xml 614 RMD160 bd86f9fb8e1911deaedaf6e7983e9de3a9e749d4 SHA1 b0ab4641480b5342c67a00edb4bc0bdc1745ca81 SHA256 3814e6b4e6f2d2b42cd82f090136270e834057a170435670c156435e9188ec2d
+EBUILD icinga-1.6.1-r1.ebuild 6966 RMD160 dc74f5db5ba287a878c89bdd409ffbce7bd10bf5 SHA1 4e0d1d97832e554d8db12fbd9d72996947fd3db1 SHA256 f73436e501d4984d61fe3e2f1ab0f338ab914baa91377f766b313806ab2de6b5
+EBUILD icinga-1.6.1-r2.ebuild 6961 RMD160 d75ffeb9562007091ac342e106e45154e10527b1 SHA1 2198bc9c8e17b3ff35a0503ecee059c13dec1b12 SHA256 097a3a082bdbb8f0264131445608130465ed7d2ecad1e35d4433022d12c22683
+MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
+MISC metadata.xml 534 RMD160 238ecadc3b6e49610eae7971ad163051640fe964 SHA1 47d5abf8e73c8bfefd7c5436237a488b1156414d SHA256 243fb55b366f5eac56dd56e4f6efa5b22cec0bd9644669b5e10b5b71ca92ef07
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREKAAYFAk9Z1N0ACgkQuUQtlDBCeQJowQCffi5itsEDdx+A/EVnm/jusT2Q
+fHoAn0ISQBZ10UFGcL/o+FqgnEPx62/5
+=XE/6
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/files/CVS/Entries b/net-analyzer/icinga/files/CVS/Entries
new file mode 100644
index 0000000..819c268
--- /dev/null
+++ b/net-analyzer/icinga/files/CVS/Entries
@@ -0,0 +1,9 @@
+/icinga-init.d/1.1/Tue Nov 15 00:01:31 2011//
+/ido2db-conf.d/1.1/Tue Nov 15 00:01:31 2011//
+/icinga-lighty.conf/1.1/Tue Nov 15 00:01:31 2011//
+/icinga-conf.d/1.1/Tue Nov 15 00:01:31 2011//
+/fix-prestripped-binaries.patch/1.1/Tue Nov 15 01:38:48 2011//
+/icinga-apache.conf/1.2/Fri Dec  2 21:27:08 2011//
+/ido2db-init.d/1.2/Sun Dec  4 19:27:46 2011//
+/icinga-init.d-2/1.5/Sun Jan  8 18:24:58 2012//
+D
diff --git a/net-analyzer/icinga/files/CVS/Repository b/net-analyzer/icinga/files/CVS/Repository
new file mode 100644
index 0000000..ec794fd
--- /dev/null
+++ b/net-analyzer/icinga/files/CVS/Repository
@@ -0,0 +1 @@
+gentoo-x86/net-analyzer/icinga/files
diff --git a/net-analyzer/icinga/files/CVS/Root b/net-analyzer/icinga/files/CVS/Root
new file mode 100644
index 0000000..9951262
--- /dev/null
+++ b/net-analyzer/icinga/files/CVS/Root
@@ -0,0 +1 @@
+prometheanfire@cvs.gentoo.org:/var/cvsroot
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
new file mode 100644
index 0000000..f734f71
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+
+opts="${opts} reload checkconfig"
+
+depend() {
+	need net
+	use dns logger firewall
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	killall -HUP icinga &>/dev/null
+	eend $?
+}
+
+checkconfig() {
+	# Silent Check
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting icinga"
+	touch /var/icinga/icinga.log /var/icinga/status.sav
+	chown icinga:icinga /var/icinga/icinga.log /var/icinga/status.sav
+	rm -f /var/icinga/rw/icinga.cmd
+	start-stop-daemon --quiet --start --startas /usr/sbin/icinga -e HOME="/var/icinga/home" --pidfile /var/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping icinga"
+	start-stop-daemon --quiet --stop --pidfile /var/icinga/icinga.lock
+	rm -f /var/icinga/status.log /var/icinga/icinga.tmp /var/icinga/icinga.lock /var/icinga/rw/icinga.cmd
+	eend $?
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting icinga"
+	svc_stop
+	svc_start
+	eend $?
+}
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
index 8763731..302a248 100644
--- a/net-analyzer/icinga/files/ido2db-init.d
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.1 2011/11/15 00:14:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.2 2011/12/04 19:27:46 prometheanfire Exp $
 
 IDO2DBBIN="/usr/sbin/ido2db"
 IDO2DBSOCKET="/var/lib/icinga/ido.sock"
diff --git a/net-analyzer/icinga/icinga-1.6.1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
index 88a675b..a8fced0 100644
--- a/net-analyzer/icinga/icinga-1.6.1.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1.ebuild,v 1.1 2011/12/02 22:09:06 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r1.ebuild,v 1.3 2011/12/29 15:59:11 prometheanfire Exp $
 
 EAPI=2
 
diff --git a/net-analyzer/icinga/icinga-1.5.1-r3.ebuild b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
index 96d204b..0029df7 100644
--- a/net-analyzer/icinga/icinga-1.5.1-r3.ebuild
+++ b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5.1-r3.ebuild,v 1.2 2011/11/22 21:06:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.6.1-r2.ebuild,v 1.3 2012/03/09 10:00:55 phajdan.jr Exp $
 
 EAPI=2
 
@@ -12,8 +12,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+apache2 api debug +idoutils lighttpd +mysql perl plugins postgres ssl +vim-syntax +web"
+KEYWORDS="amd64 x86"
+IUSE="+apache2 debug +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web"
 DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
 	perl? ( dev-lang/perl )
 	virtual/mailx
@@ -33,49 +33,6 @@ pkg_setup() {
 	enewgroup icinga
 	enewgroup nagios
 	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
-	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 \"-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
-
 }
 
 src_prepare() {
@@ -84,7 +41,6 @@ src_prepare() {
 
 src_configure() {
 	local myconf
-	local myconf2
 
 	myconf="$(use_enable perl embedded-perl)
 	$(use_with perl perlcache)
@@ -98,36 +54,33 @@ src_configure() {
 	$(use_enable debug DEBUG5)
 	--disable-statuswrl
 	--with-cgiurl=/icinga/cgi-bin
-	--with-log-dir=/var/log/icinga"
-
-	myconf2="--bindir=/usr/sbin
+	--with-log-dir=/var/log/icinga
+	--bindir=/usr/sbin
 	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
 	--datarootdir=/usr/share/icinga/htdocs
 	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga"
+	--sysconfdir=/etc/icinga
+	--with-lockfile=/var/run/icinga/icinga.lock
+	--with-temp-dir=/tmp/icinga"
 
 	if use plugins ; then
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
+		myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
 	else
-		myconf2+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
+		myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/plugins"
 	fi
 
 	if use !apache2 && use !lighttpd ; then
-		myconf2+=" --with-command-group=icinga"
+		myconf+=" --with-command-group=icinga"
 	else
 		if use apache2 ; then
 			myconf+=" --with-httpd-conf=/etc/apache2/conf.d"
-			myconf2+=" --with-command-group=apache"
+			myconf+=" --with-command-group=apache"
 		elif use lighttpd ; then
-			myconf2+=" --with-command-group=lighttpd"
+			myconf+=" --with-command-group=lighttpd"
 		fi
 	fi
 
-	econf ${myconf} ${myconf2}
-	if use api ; then
-		cd module/icinga-api || die
-		econf ${myconf2}
-	fi
+	econf ${myconf}
 }
 
 src_compile() {
@@ -151,19 +104,13 @@ src_install() {
 		sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile || die
 	fi
 
-	sed -i -e 's/^contactgroups$//g' Makefile || die
-
 	emake DESTDIR="${D}" install{,-config,-commandmode} || die
 
-	sed -i -e 's/var\/lib\/icinga\/icinga.lock/var\/run\/icinga\/icinga.lock/g' "${D}"/etc/icinga/icinga.cfg || die
-	sed -i -e 's/var\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
+	sed -i -e 's/var\/lib\/icinga\/icinga.tmp/tmp\/icinga\/icinga.tmp/g' "${D}"/etc/icinga/icinga.cfg || die
 
 	if use idoutils ; then
 		 emake DESTDIR="${D}" install-idoutils || die
 	fi
-	if use api ; then
-		 emake DESTDIR="${D}" install-api || die
-	fi
 
 	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
@@ -217,6 +164,49 @@ src_install() {
 }
 
 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"
@@ -226,6 +216,16 @@ pkg_postinst() {
 	elog "filesystem. You can fix this by adding icinga into"
 	elog "the group wheel, but this is not recomended."
 	elog
-	elog "/var/icinga was moved to /var/lib/icinga"
-	elog "please move the file if this was an upgrade"
+	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
 }
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index bc77e2a..65a79e7 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>
 	<use>
-		<flag name="api">Adds support for the icinga API</flag>
 		<flag name="idoutils">Adds DB support</flag>
 		<flag name="lighttpd">Adds Lighttpd support</flag>
 		<flag name="plugins">Adds support for nagios plugins</flag>