removed old ebuilds for 434586 and cleanup

(Portage version: 2.1.11.9/cvs/Linux x86_64)

8 files changed, 68 insertions, 1027 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index e4506d51aebc..875e06906517 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.25 2012/09/16 11:06:36 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.26 2012/09/17 19:48:49 prometheanfire Exp $
+
+  17 Sep 2012; Matthew Thode <prometheanfire@gentoo.org>
+  -icinga-1.6.1-r2.ebuild, -icinga-1.7.0.ebuild, -icinga-1.7.1-r3.ebuild,
+  -icinga-1.7.1-r4.ebuild, icinga-1.7.2.ebuild, files/icinga-init.d,
+  files/ido2db-init.d:
+  removing old ebuilds for 434586 and cleanup
 
   16 Sep 2012; Andreas Schuerch <nativemad@gentoo.org> icinga-1.7.2.ebuild:
   x86 stable, see bug 434586
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
index 683e52c4c4e5..ad3108ad5bc9 100644
--- a/net-analyzer/icinga/files/icinga-init.d
+++ b/net-analyzer/icinga/files/icinga-init.d
@@ -1,18 +1,35 @@
 #!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d,v 1.3 2012/09/17 19:48:49 prometheanfire Exp $
 
-extra_commands="${extra_commands} reload checkconfig"
+: ${ICINGACFG:=/etc/icinga/icinga.cfg}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command=/usr/sbin/icinga
+command_args="-d ${ICINGACFG}"
+
+get_config() {
+    if [ -e "${ICINGACFG}" ]; then
+	    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${ICINGACFG}"
+	fi
+}
+
+pidfile=$(get_config lock_file)
+start_stop_daemon_args="-e HOME=/var/lib/icinga"
 
 depend() {
 	need net
-	use dns logger firewall
-	after mysql postgresql ido2db
+	use dns logger firewall mysql postgresql ido2db
 }
 
 checkconfig() {
 	# Silent Check
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg &>/dev/null && return 0
+	${command} -v ${ICINGACFG} &>/dev/null && return 0
 	# Now we know there's problem - run again and display errors
-	/usr/sbin/icinga -v /etc/icinga/icinga.cfg
+	${command} -v ${ICINGACFG}
 	eend $? "Configuration Error. Please fix your configfile"
 }
 
@@ -20,25 +37,19 @@ reload()
 {
 	checkconfig || return 1
 	ebegin "Reloading configuration"
-	kill -HUP `cat /var/run/icinga/icinga.lock` &>/dev/null
+	kill -HUP $(cat ${pidfile}) &>/dev/null
 	eend $?
 }
 
-start() {
-	ebegin "Starting icinga"
-	checkpath -d -o icinga:icinga /tmp/icinga /var/run/icinga /var/log/icinga /var/lib/icinga
-	checkpath -f -o icinga:icinga /var/log/icinga/icinga.log
-	rm -f /var/lib/icinga/rw/icinga.cmd
-	start-stop-daemon --start --exec /usr/sbin/icinga -e HOME="/var/lib/icinga/home" --pidfile /var/run/icinga/icinga.lock -- -d /etc/icinga/icinga.cfg
-	eend $?
+start_pre() {
+	checkpath -d -o icinga:icinga $(get_config temp_path)  $(dirname $(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname $(get_config status_file))
+	checkpath -f -o icinga:icinga $(get_config log_file)
+	rm -f $(get_config command_file)
 }
 
-stop() {
-	ebegin "Stopping icinga"
-	start-stop-daemon --stop --pidfile /var/run/icinga/icinga.lock
-	rm -f /var/lib/icinga/status.log /var/run/icinga/icinga.lock /var/lib/icinga/rw/icinga.cmd
+stop_post() {
+	rm -f $(get_config command_file)
 	rm -r /tmp/icinga
-	eend $?
 }
 
 svc_restart() {
@@ -48,3 +59,4 @@ svc_restart() {
 	svc_start
 	eend $?
 }
+
diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d
index 302a24881959..d9ceb4584e6f 100644
--- a/net-analyzer/icinga/files/ido2db-init.d
+++ b/net-analyzer/icinga/files/ido2db-init.d
@@ -1,36 +1,40 @@
 #!/sbin/runscript
-# 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/files/ido2db-init.d,v 1.2 2011/12/04 19:27:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.3 2012/09/17 19:48:49 prometheanfire Exp $
 
-IDO2DBBIN="/usr/sbin/ido2db"
-IDO2DBSOCKET="/var/lib/icinga/ido.sock"
-IDO2DBLOCK="/var/lib/icinga/ido2db.lock"
-
-function check() {
-	if [ -S "${IDO2DBSOCKET}" ] ; then
-		ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\""
-		ewarn "it will be removed now and re-created by ido2db"
-		ewarn "BUT please make your checks."
-		rm -f "${IDO2DBSOCKET}"
-	fi
+get_config() {
+    if [ -e "${IDO2DBCFG}" ]; then
+        sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${IDO2DBCFG}"
+    fi
 }
 
+command=/usr/sbin/ido2db
+command_args="-c ${IDO2DBCFG}"
+pidfile="$(get_config lock_file)"
+
 depend() {
+	config "${IDO2DBCFG}"
+
 	need net
 	use dns logger firewall
-	after mysql postgresql
-}
 
-start() {
-	check
-	ebegin "Starting ido2db"
-	start-stop-daemon --start --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN} -- -c ${IDO2DBCFG}
-	eend $?
+	case $(get_config db_servertype) in
+	    mysql)
+		use mysql ;;
+	    pgsql)
+		use postgresql ;;
+	esac
 }
 
-stop() {
-	ebegin "Stopping ido2db"
-	start-stop-daemon --stop --exec ${IDO2DBBIN} --pidfile ${IDO2DBLOCK} --name ${IDO2DBBIN}
-	eend $?
+IDO2DBSOCKET="$(get_config socket_name)"
+
+
+start_pre() {
+	if [ -S "${IDO2DBSOCKET}" ] ; then
+		ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\""
+		ewarn "it will be removed now and re-created by ido2db"
+		ewarn "BUT please make your checks."
+		rm -f "${IDO2DBSOCKET}"
+	fi
 }
diff --git a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
deleted file mode 100644
index b27b10ab275e..000000000000
--- a/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# 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.6.1-r2.ebuild,v 1.5 2012/06/12 02:25:00 zmedico Exp $
-
-EAPI=2
-
-inherit depend.apache eutils multilib toolchain-funcs user
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	web? (
-		media-libs/gd[jpeg,png]
-		lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )
-		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-
-want_apache2
-
-pkg_setup() {
-	depend.apache_pkg_setup
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/spool/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/fix-prestripped-binaries.patch"
-}
-
-src_configure() {
-	local myconf
-
-	myconf="$(use_enable perl embedded-perl)
-	$(use_with perl perlcache)
-	$(use_enable idoutils)
-	$(use_enable ssl)
-	$(use_enable debug DEBUG0)
-	$(use_enable debug DEBUG1)
-	$(use_enable debug DEBUG2)
-	$(use_enable debug DEBUG3)
-	$(use_enable debug DEBUG4)
-	$(use_enable debug DEBUG5)
-	--disable-statuswrl
-	--with-cgiurl=/icinga/cgi-bin
-	--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
-	--with-lockfile=/var/run/icinga/icinga.lock
-	--with-temp-dir=/tmp/icinga"
-
-	if use plugins ; then
-		myconf+=" --libexecdir=/usr/$(get_libdir)/nagios/plugins"
-	else
-		myconf+=" --libexecdir=/usr/$(get_libdir)/icinga/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
-
-	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
-
-	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
-	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 {} +
-	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
-}
diff --git a/net-analyzer/icinga/icinga-1.7.0.ebuild b/net-analyzer/icinga/icinga-1.7.0.ebuild
deleted file mode 100644
index 92d44bd1268e..000000000000
--- a/net-analyzer/icinga/icinga-1.7.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# 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.0.ebuild,v 1.2 2012/06/12 02:25:00 zmedico 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 debug 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 dev-lang/php[cgi] )
-		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
-	)
-	!net-analyzer/nagios-core"
-RDEPEND="${DEPEND}
-	plugins? ( net-analyzer/nagios-plugins )"
-
-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)
-	$(use_enable debug DEBUG0)
-	$(use_enable debug DEBUG1)
-	$(use_enable debug DEBUG2)
-	$(use_enable debug DEBUG3)
-	$(use_enable debug DEBUG4)
-	$(use_enable debug DEBUG5)
-	--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
-	fi
-
-	if use eventhandler ; then
-		dodir /etc/icinga/eventhandlers || die
-		fowners icinga:icinga /etc/icinga/eventhandlers || die
-	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 {} +
-	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
-}
diff --git a/net-analyzer/icinga/icinga-1.7.1-r3.ebuild b/net-analyzer/icinga/icinga-1.7.1-r3.ebuild
deleted file mode 100644
index dc5ab774657a..000000000000
--- a/net-analyzer/icinga/icinga-1.7.1-r3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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
-}
diff --git a/net-analyzer/icinga/icinga-1.7.1-r4.ebuild b/net-analyzer/icinga/icinga-1.7.1-r4.ebuild
deleted file mode 100644
index 24ce36b4a66e..000000000000
--- a/net-analyzer/icinga/icinga-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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-r4.ebuild,v 1.1 2012/08/19 04:43:24 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-2 icinga || die
-	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
-	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d-2 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
-}
diff --git a/net-analyzer/icinga/icinga-1.7.2.ebuild b/net-analyzer/icinga/icinga-1.7.2.ebuild
index afe9c1552ab6..55c979be7426 100644
--- a/net-analyzer/icinga/icinga-1.7.2.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2012/09/16 11:06:36 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/icinga-1.7.2.ebuild,v 1.4 2012/09/17 19:48:49 prometheanfire Exp $
 
 EAPI=2
 
@@ -124,10 +124,10 @@ src_install() {
 		emake DESTDIR="${D}" install-eventhandlers || die
 	fi
 
-	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
+	newinitd "${FILESDIR}"/icinga-init.d icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
 	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d-2 ido2db || die
+		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