cleanup and new init, thanks flameeyes :D

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

7 files changed, 127 insertions, 532 deletions

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index e809a0651dfb..38857c4310e4 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.20 2012/08/17 20:53:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.21 2012/08/19 04:43:24 prometheanfire Exp $
+
+*icinga-1.7.1-r4 (19 Aug 2012)
+
+  19 Aug 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r4.ebuild, +files/icinga-init.d-2, +files/ido2db-init.d-2:
+  updating initscripts
 
 *icinga-1.7.1-r3 (17 Aug 2012)
 
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index ba7ca5f378a5..9dd7bea58284 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,34 +6,34 @@ AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e851819
 AUX icinga-apache.conf 591 SHA256 a5e7b64baa21f04d5ce6540571260f5de45382e3af93dca99ae8f57b5fb299df SHA512 f08d6d17fcbd695af43a6e2ca230c001ad5ab2ce4f50c61ed8a41addb1eebc7a6fbbb0a53d72ba5686d5a8d0f21d9a2e9cff98e8ce53e8bd04d9a658300d327a WHIRLPOOL 5b93d216745a5aee353aa03e5054926bf6e0ef8929ce17b174672787254a4b3c9707a3d718ca75619d03436818543434c621f8e97f9914bef616dba2ddc093d1
 AUX icinga-conf.d 178 SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db SHA512 96411175c488423c61f45fc9c76131a9807a36f08c9f73c6a6fb50e432d951d3e4ab42b456732b48cb009944faff4af472eb76fbefd75fd61978dfc6d199e9cd WHIRLPOOL acf6b66165c227515099f25b6db38c5cce86a50844983123a136f6cf63ce744f49fde1d243c2dcadbceaf62154e3fbc8eadca8933c80fc0501aaaf52c5e0266a
 AUX icinga-init.d 1267 SHA256 cfef566114fcfbd53dc3f43f7352b934d33c7a0d62f554dfb0eae352f6e09d01 SHA512 7bbbcf49e8abe74c5047c836ef05bd1b80936139a93d2307d1f6a313ce0443a2350e8a9dc936b725825b55d9740e280134634b2ae331b4a56be356ed618ff383 WHIRLPOOL ec9a1e159e5452e54b825c85ef70008d1c8a747c7c5415d8b913d4bb5080e44f3ecec8f829904865d742027d4dc4a31c7a59ce40c4d268972b8952599bb185bf
+AUX icinga-init.d-2 1443 SHA256 f1373535e03f776e01bfe61091eda2106a521da8a6f35a1d33122bfca6a9a2ef SHA512 454fa85cfbf9b602f089e67281bc49ee2ed99eee5b216730aa709dfec1546ef246d8694d960b620fc442a4906a08cc0b5c9aa4d560318e0f523ff4ef39241d36 WHIRLPOOL 46c2cf917507cf05f6dc4e0b334beb7950b3c5bd56ceb62a915cc3c2e13984848ebd5854801ee6394724717f33c14350373bf1bc91d73048114d51301c0cde2d
 AUX icinga-lighty.conf 465 SHA256 f4059bc54959fb2544f23c2fc6a86f0ab2467025ce1f468317a0079b55116b44 SHA512 2a8783945330c54eaa331587f2e7291bdddb8c6717c659ac8dfec7c14ab762a01a870f5fb35d91bb54f36c867eb56c13dce11b5ab13d6e5b6fc9049ce5f57372 WHIRLPOOL 3634d30b9e4841f4424ce36983a88e56ccf3385ab5c9f8e27f322a0ebc59985cb618dbe70d8f67ab641e8a6151721f70cc0f104c905b4da0c35af6ceb899eca1
 AUX ido2db-conf.d 35 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372 SHA512 c2988f205ce29daaacd2daa20ceb285da2b76e2a68bb5dd695874e73b275714eaea5e0b6bb0afaf7e5d875a9e89ee35c7dfcdb5c77513b2f1a59fbbd28f49f4f WHIRLPOOL 7816a44592582b65bb05b7c568af29885ab547b0164582d939e37b937ddc0cfa3dfc503b8673042b5ce60e0b19ba96dcfe08e13882c8bbae80d9750411945966
 AUX ido2db-init.d 990 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252 SHA512 63eeae884ec06fc51f8fe6216296764624e4548e50085c4d4cad45d584c2d3d2c28845903766d33260b4a8c67bb227ae02ea7616ab22c307cfafc4fe6fc51045 WHIRLPOOL 4757277000feef7f3b219974436607e4391c9b36c039af5017b72f271dcd67e46b01781df911262c95573e19114890f3574c851aaf432d4c4237f88015176dd7
+AUX ido2db-init.d-2 896 SHA256 20d37df909ffa78d77dd16ec6e3238eee5e3e34eca407ed3eb008522916dce02 SHA512 b1838896612b55c80eefd2b19748977a1e86aecccf981993f00f8a1bcc593cb7b078a68d78e1fc685f2d992c789879c6aa2279c36a5dcc994d164f9d15f64e2b WHIRLPOOL a26b2571a4ca8dffd6564aebe8b069ce6e8dbce14e025122212a97e516a16b51331001e0b650d3bcb5a3409162a699eba026b7697d1f0716e0d16eb4470265e7
 DIST icinga-1.6.1.tar.gz 12880538 SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b SHA512 70267fb43327aa91cdfdb4318a84c5abe80b9dc9625fea515cacdbf0745c82ed1864ba5dd93d6d3c8e2590faf2ef414d9ff13cec4ad68983576df09f259f8d74 WHIRLPOOL b2612d84ca7e7a7d17d1896ab51fb7438a0a635814d0ed279cafbd4231548042018a16ef7c9ae023ae4b30ac9d6279d0a6faaff287222a2eb6dfc1376392b7ec
 DIST icinga-1.7.0.tar.gz 12939198 SHA256 e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b SHA512 4378f28e230f21826c51d3347ad063cbf02334c0c8c67628a7dcd8022fa170c1e33003320007b6d7a2561bb33c4519bbc75aa6a863ac683bba2002b8ef112cc5 WHIRLPOOL 8fa106f0ed2f403cfc2f2f00774234c094f860837741e455631a52e94a798eb0ba22387036ffdec428b6955a83915464fb0ce00cb4f04115627b946215dfb88b
 DIST icinga-1.7.1.tar.gz 12938365 SHA256 86662178fae6a3618340b2d0b0fad5033439556649f79214a9a2331c10c2cab6 SHA512 755bcb52b1d49d64248cb214ac712591fd02bc353f095cf6047bad05efa4528e879bf9424ceccd0136b371488d13f0644fc7fa62e4630ca926bddb1cf386046c WHIRLPOOL bd91331b87990c833d3714ff35f54ffc93b84ed76904634ea0a14079f86ae1261393620923ce271986331dbae0e5726d71af184784f0f89d0cf6e42b620e9d65
 EBUILD icinga-1.6.1-r2.ebuild 6961 SHA256 1b59c64f2906d8b12a39fce9539b558c9673be00b9af06e316e8a490b12f8fde SHA512 891a96b937288eb5a4d3c67712e7453dc50a814e0f315b07876a5b4c2075a06c6d00991b848444d6ea3d12d01c947c1b9db7abe8ce7406a3a4e5f8b51bbb2e1d WHIRLPOOL 4080a5fdbe89c848561a0bc8fc0845f05ec18de50b127e34bc81b45f369055649d9c217978e8f28fe4aa186c8aeedb6167596114a265f30cd661ac534e3b5202
 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 3863 SHA256 e97eb17d2bac6e4a7e5cfb66a32eef6d4d0f599dadd8d7a69fffde097589a7b5 SHA512 ff2d24ff2ddba69cf49770d1b7cf2fe291603a0f4e58f46ff5963e9f429db786d69e6dd8decc568af3af852d8bdfb300972b1e4c7e45279119f55d9f241d0a68 WHIRLPOOL 9bfef64b6b6eb73cae3fced4192843c659255cbe71681609a4ff2a942f25a98291983a5fd1f8a1c11ffd645ceca9994ef408db01b0a07aed510391053f5b2a1b
+EBUILD icinga-1.7.1-r4.ebuild 7420 SHA256 98dfc269f5722c87e806a20cb137ef1810ab4107936d57b0081323b65436d422 SHA512 1dc70fa485b46bb0007af6e337a1af1dce2401409c31a8216adcaece752a33860c94dc6470f732dab85ab3545120ddf72c7ddaf38e1b4dbcfd1cfb529b703f89 WHIRLPOOL cce363f1a68d3fc7583e239e4e3ea2f6489c558b5d905bd88f562dd50434041d34e3320ee3a36e050adf4236563e96597c79dde6dfff605ff6ea53bf623d7d45
+MISC ChangeLog 4051 SHA256 f0b715654e799020bcf1a934700dbfd7dbc77e8ccb0dfa346fffa4ccba730416 SHA512 a51cd5888ac3c6899f09675caf05987b7d056e49bfb9624ce37bb0a85d83d1365af1d3d6987a3f40bae3fa177d35607ee89a4067b9b4b9b5e2396788a7bfae33 WHIRLPOOL 55702c209787c21df492d7c497a481a5f25382146cee474d40406edba3cc86d8a96351928ba8c9268b32602e3f17e83eeff0ab80d4bc5e7af037e3859ea74125
 MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-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
+iQIcBAEBAgAGBQJQMG75AAoJECRx6z5ArFrDir4P/1qXPNg/g+WZBGLDGVyavA+7
+3kCr7eyS6soLQk3brTDFDWtQ9CzoiZCxX7IBdd9+1/MCgTA0UBPto4XHbZ3V6lVh
+YQCEH4BIqHQfwtkADOjOo2joNf+pB5jGHHZdsgo7Zm8VRw9l5919mSm+7pKKFTdf
+D+fUDw7p1Dii3FzCOgmKhnFfULhA5m3ki9pNMY0H/Jx4Tbo6Pz1GgxLXU9ibhcrt
+zDCMqJMsONYGtwEdqAv0WEPERS3fSVcRC+5+shvXarXvVo37mh+WJ4lqzQR5K0UQ
+TF4XfIb9yIejPpQbLbnBTXfn3B2bgaoTmbKarrcaEDwvlQJuZHUHkuLtvU/6dGPu
+D97+D3rCbutKj2QyX6CEjKSyu729jhN1TuE869yahe4QsAPFr3wzJCncSFdHXpFD
+6jeJzGwc7NRFYkMhx2mubJLj+eFCGX6NwesLACcY/vLpZU5CFtGH3U0tmUTWKJ0G
+MV27YFMo42gJKcIklbn4OH6hY3997BmVs7TCNDMwuenoLeAvilVsmTy2fu/GByuN
+cqwWAgEmD2pLT7ZeFrus79CNNZ6hp6iX5KHWTuQ90GjjM9XKhzLEhGygKS7B4aw+
+OOAcIXtPxeSr2XKvsB7/9HVf9A23Fi5y3cdb2i5+iZGgo7A8RPcWkhYoIklGQE6V
+vInT13fe18LeOaibyqcf
+=xS3Q
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/files/icinga-init.d-2 b/net-analyzer/icinga/files/icinga-init.d-2
new file mode 100755
index 000000000000..85f64ad554dd
--- /dev/null
+++ b/net-analyzer/icinga/files/icinga-init.d-2
@@ -0,0 +1,61 @@
+#!/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-2,v 1.7 2012/08/19 04:43:25 prometheanfire Exp $
+
+: ${ICINGACFG:=/etc/icinga/icinga.cfg}
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command=/usr/sbin/icinga
+command_args="-d ${ICINGACFG}"
+
+get_config() {
+	sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	"${ICINGACFG}"
+}
+
+pidfile=$(get_config lock_file)
+start_stop_daemon_args="-e HOME=/var/lib/icinga"
+
+depend() {
+	need net
+	use dns logger firewall mysql postgresql ido2db
+}
+
+checkconfig() {
+	# Silent Check
+	${command} -v ${ICINGACFG} &>/dev/null && return 0
+	# Now we know there's problem - run again and display errors
+	${command} -v ${ICINGACFG}
+	eend $? "Configuration Error. Please fix your configfile"
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	kill -HUP $(cat ${pidfile}) &>/dev/null
+	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_post() {
+	rm -f $(get_config command_file)
+	rm -r /tmp/icinga
+}
+
+svc_restart() {
+	checkconfig || return 1
+	ebegin "Restarting icinga"
+	svc_stop
+	svc_start
+	eend $?
+}
+
diff --git a/net-analyzer/icinga/files/ido2db-init.d-2 b/net-analyzer/icinga/files/ido2db-init.d-2
new file mode 100644
index 000000000000..74ca1c286ac3
--- /dev/null
+++ b/net-analyzer/icinga/files/ido2db-init.d-2
@@ -0,0 +1,38 @@
+#!/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/ido2db-init.d-2,v 1.1 2012/08/19 04:43:25 prometheanfire Exp $
+
+get_config() {
+    sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \
+	"${IDO2DBCFG}"
+}
+
+command=/usr/sbin/ido2db
+command_args="-c ${IDO2DBCFG}"
+pidfile="$(get_config lock_file)"
+
+depend() {
+	config "${IDO2DBCFG}"
+
+	need net
+	use dns logger firewall
+
+	case $(get_config db_servertype) in
+	    mysql)
+		need mysql ;;
+	    pgsql)
+		need postgresql ;;
+	esac
+}
+
+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.7.1-r1.ebuild b/net-analyzer/icinga/icinga-1.7.1-r1.ebuild
deleted file mode 100644
index 3c4eacf61c73..000000000000
--- a/net-analyzer/icinga/icinga-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,255 +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-r1.ebuild,v 1.1 2012/06/25 18:58:02 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 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 )"
-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)
-	$(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-r2.ebuild b/net-analyzer/icinga/icinga-1.7.1-r4.ebuild
index 0356c9f51b7c..24ce36b4a66e 100644
--- a/net-analyzer/icinga/icinga-1.7.1-r2.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.1-r4.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.1-r2.ebuild,v 1.1 2012/07/09 20:44:38 prometheanfire Exp $
+# $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
 
@@ -22,8 +22,7 @@ DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] )
 	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] ) )
+		lighttpd? ( www-servers/lighttpd )
 	)
 	!net-analyzer/nagios-core"
 RDEPEND="${DEPEND}
@@ -125,10 +124,10 @@ src_install() {
 		emake DESTDIR="${D}" install-eventhandlers || die
 	fi
 
-	newinitd "${FILESDIR}"/icinga-init.d icinga || die
+	newinitd "${FILESDIR}"/icinga-init.d-2 icinga || die
 	newconfd "${FILESDIR}"/icinga-conf.d icinga || die
 	if use idoutils ; then
-		newinitd "${FILESDIR}"/ido2db-init.d ido2db || die
+		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
diff --git a/net-analyzer/icinga/icinga-1.7.1.ebuild b/net-analyzer/icinga/icinga-1.7.1.ebuild
deleted file mode 100644
index 363f580f2e45..000000000000
--- a/net-analyzer/icinga/icinga-1.7.1.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.1.ebuild,v 1.1 2012/06/18 18:23:28 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 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
-}