resync icnga with tree and add pax_kernel support to spotify

9 files changed, 180 insertions, 537 deletions

diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 037d644..cc51416 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,3 +1,3 @@
 DIST spotify-client_0.8.4.103.g9cb177b.260-1_amd64.deb 31702600 SHA256 d350defa4164aaf129985df7e3ca33fc3f88aad2fac1637e6a26cc1794f3b378 SHA512 0f07ff8e2844d3f2626fa02351474a76b0d7178dd94d4d857ff2a0b6d28f887980889e4bc57fab18ab2a0cb6d7771e90bb7a20c2427ab69e2195f5de47ae3622 WHIRLPOOL 7d8a24fdbd9a12e92443264bcb01f27a322028c2074b40cb26e8f0e06195175ae8f369da41cde5d8dbe741792ad3250dc408addf9ceee594f2782a45772817f7
 DIST spotify-client_0.8.4.103.g9cb177b.260-1_i386.deb 28110850 SHA256 61502995da6b126eb6801bf92a8463a7fdd37dc6be0e0aba3560bdadde3531c7 SHA512 b48c70267781dc4b6d5afeee8061a95266de59ae02d252b054cd3a63a8bdcb19a461e7c28095d3884f7e7ff1129778ab7549dda9b891dc107f54182e13725dc2 WHIRLPOOL 0c443030bad393721c964c36561b84eb1388248a47d0dcc2f14541f5a33de4364a2de081e69c8c379e3a4ef529209b76d1f2e14fdaef68631471b414e01ba239
-EBUILD spotify-0.8.4.103.ebuild 3118 SHA256 6964996f6c819c549a5a5fc6b7685289546d1cdd4d6d313925026faa94fd5138 SHA512 873dbf0f59dc7e41ec12e71bce2351f4ad9de82f6e8ac509b3ceb09c15d64d14212c454cb4e8bc0948b7ba34cc26f5c3bfe74951642dc7acbfc1a45b76e8c88b WHIRLPOOL 203263d9dc330156c77f7b3449191fc2ce921c035a7225393348963b73568d064d0678fbaa6bf56f4f3fd7319d988b1a9606744e788198c183d88bb042c8d73b
+EBUILD spotify-0.8.4.103.ebuild 3648 SHA256 7544020e6889310834d10e2fcab189628c029cfde4e796a967f179ab6dbd3637 SHA512 8e1a28bddb8bfc242d70c2c22f6bc2860443e9d12124f9c1fab9be3b5b674af60927f219bca9b3edce6aea8206673323ff7d6126a917d7409ac051b06efbdee5 WHIRLPOOL 57b982e105629194e4f7268d4ed050832ed265b8ef88097687958640dd3d2035195ce1cab9ac87ab93aeadd6320109b5ac6b7d3d0488813aad6e953e62a24817
diff --git a/media-sound/spotify/spotify-0.8.4.103.ebuild b/media-sound/spotify/spotify-0.8.4.103.ebuild
index 0900588..05a9d8a 100644
--- a/media-sound/spotify/spotify-0.8.4.103.ebuild
+++ b/media-sound/spotify/spotify-0.8.4.103.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio gnome"
+IUSE="pax_kernel pulseaudio gnome"
 
 DEPEND=""
 RDEPEND="${DEPEND}
@@ -114,6 +114,15 @@ src_install() {
 	cat <<-EOF >"${D}"/etc/revdep-rebuild/10${PN}
 		SEARCH_DIRS_MASK="${SPOTIFY_HOME}"
 	EOF
+
+    if use pax_kernel; then                                                     
+        pax-mark Cm "${ED}"/opt/bin/${PN} || die                                
+        eqawarn "You have set USE=pax_kernel meaning that you intendto run"
+        eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+        eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+        eqawarn "you suspect that ${PN} is being broken by this modification,"
+        eqawarn "please open a bug."
+    fi
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 2bed39f..1d20ab8 100644
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -1,6 +1,75 @@
 # 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.14 2012/03/09 10:00:55 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/ChangeLog,v 1.27 2012/09/17 19:53:22 prometheanfire Exp $
+
+  17 Sep 2012; Matthew Thode <prometheanfire@gentoo.org> files/icinga-init.d,
+  files/ido2db-init.d:
+  part 2 of previous commit
+
+  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
+
+  11 Sep 2012; Agostino Sarubbo <ago@gentoo.org> icinga-1.7.2.ebuild:
+  Stable for amd64, wrt bug #434586
+
+*icinga-1.7.2 (10 Sep 2012)
+
+  10 Sep 2012; Matthew Thode <prometheanfire@gentoo.org>
+  icinga-1.6.1-r2.ebuild, +icinga-1.7.2.ebuild, files/icinga-init.d-2,
+  files/ido2db-init.d-2:
+  update to 1.7.2 for bugs 433401 and 434586
+
+  19 Aug 2012; Matthew Thode <prometheanfire@gentoo.org> files/ido2db-init.d-2:
+  forgot to change the need mysql/postgresql to use
+
+*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)
+
+  17 Aug 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r3.ebuild:
+  adding icinga-1.7.1-r3.ebuild to remove the php dep
+
+*icinga-1.7.1-r2 (09 Jul 2012)
+
+  09 Jul 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r2.ebuild:
+  removed debug (not used anymore) and fixed emerging without web use flag bug
+  #424795
+
+*icinga-1.7.1-r1 (25 Jun 2012)
+
+  25 Jun 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga-1.7.1-r1.ebuild:
+  restricting the test feature because not all the packages needed to test are
+  in tree. sorta fixes bug #423265
+
+*icinga-1.7.1 (18 Jun 2012)
+
+  18 Jun 2012; Matthew Thode <prometheanfire@gentoo.org> +icinga-1.7.1.ebuild:
+  Version bump, bugfix release
+
+  12 Jun 2012; Zac Medico <zmedico@gentoo.org> icinga-1.6.1-r2.ebuild,
+  icinga-1.7.0.ebuild:
+  inherit user for enewgroup and enewuser
+
+*icinga-1.7.0 (15 May 2012)
+
+  15 May 2012; Matthew Thode <prometheanfire@gentoo.org>
+  +files/fix-prestripped-binaries-1.7.0.patch, +icinga-1.7.0.ebuild,
+  -files/icinga-init.d, -icinga-1.6.1-r1.ebuild, files/icinga-init.d,
+  icinga-1.6.1-r2.ebuild, metadata.xml:
+  adding 1.7.0 and removing 1.6.1-r1
 
   09 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> icinga-1.6.1-r2.ebuild:
   x86 stable wrt bug #403949
diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index b6f1cc6..a89539f 100644
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1,15 +1,32 @@
-AUX fix-prestripped-binaries-1.7.0.patch 857 RMD160 c704cb3cd5fdcd1c04d9a39706d0e74ebcb4f560 SHA1 38516871288f77104c7057925f65ccd2414e2ed8 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad
-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 1265 RMD160 7c3716d06b4b0e781d59ae07a8117b14def94b21 SHA1 467a5f683eaa545cd0979fbf4cbafcc3890bcba4 SHA256 febeb6ef97d8f0aa5de24f8152939a3003d1f5f8933b5bf96b048d02c216db95
-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 4eef38e9266754653a7cc5c2f00e294a060941bd SHA1 fc444a4845bf8c6a5c0378f397583b11ce4bd5f1 SHA256 b59b82578929c54ecf8555ffd28c1a13f4b7e856240f8b1c77c9ceca06839252
-DIST icinga-1.6.1.tar.gz 12880538 RMD160 f755d1499c9794fb9a60e0e35dbc091758e72dc1 SHA1 b14cc8be0a8b49ccd41018223d34600db7bc4f3d SHA256 80b980272dd45bcd14b79d98b1125d6aa4184c20644863f71d9f3e00fbced89b
-DIST icinga-1.7.0.tar.gz 12939198 RMD160 465edafc080c1674e17daf24a2ce8dabc203dae7 SHA1 3cf1bd7957166a44b1fc106082d1a04bbfa1799e SHA256 e0d033e37bd3c4fb6a35151cc94aae4ca8e730510d9156ea755245728f8acb8b
-EBUILD icinga-1.6.1-r1.ebuild 6964 RMD160 8a5d24a7c2720ea577e65b64d8a0ebbf487b168b SHA1 3e5897629ce6cff3e00bd56dc9064095a6c84f73 SHA256 186a9cf8cbadc791c7ba7dcf15d7d0a2ce05b4e85d17837cf1b993c3e89c2129
-EBUILD icinga-1.6.1-r2.ebuild 6959 RMD160 3e9b5f213127d33939bc6a947a9a57c679a27bc1 SHA1 e15ada15d39639b71769bf37e06219a0b637a52b SHA256 7af2304fd680787a0aa41c86dddca14e284d9e54837edd3034a72d26a4b22873
-EBUILD icinga-1.7.0.ebuild 7639 RMD160 37b1d4e0f96022a6853b2eba506dda130b366540 SHA1 6bb25ac0f4857c039679e85cfb2c7032bc5be408 SHA256 10de46edb91495fdf7f9cfb9595f761af9bb4a756439b761c58a9f98d1ff4cea
-MISC ChangeLog 2671 RMD160 5b3d16a808c690a9de9fb3986e9da4d33087fc09 SHA1 c8a95d3a02d5e9519a65b5c9883610e203bf43cb SHA256 6ab976e5775c734aa8d619c29bbb3320e07774e893107512c5c7f8438ca0a4cb
-MISC metadata.xml 656 RMD160 d127ece7480eec27f50e853ff0192e5854819ae5 SHA1 03e185a7f1bd4ed5b1356e9ddaa7b73038b7fa27 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX fix-prestripped-binaries-1.7.0.patch 857 SHA256 dba024fff1934a44e7f3e20e93c121aa251ef1286c8971247e45509c31aaf3ad SHA512 4a01ff3cf8569cfeadad283d1085b7af4f5703f6ad066aa5eb61f06f79ca54a4fd29375dd9a120a1a649c7e76019298e9e99ee1360717db227ff63c0a9cc021c WHIRLPOOL 5029ccefc5e66ca363dbed33ce8df99c6993a0f82942143e9c8ada45481f6bcaecfa62380bb69802fb0d0b3910e4501ec2378423d8b72b5cd93822e60a993e22
+AUX fix-prestripped-binaries.patch 775 SHA256 0e436d2db97e5f0c1985e2ab3c7e8518196468b99e43ac4e7c2a73f1fcb08957 SHA512 a5db714d24e1d2fabc9d30d6156f84ba87db05fa6c1ba76543f646d31a16542abf19ffed89766b51a15c24f8fe4c74ce5e24e3ee76826ef324e11d98e3528cb6 WHIRLPOOL 82609265990b25673c71956ef6dd7f50b124918c45aa54716ff9d50fa9e429f94b82af4ef2df27781450b416ed2dca90a5818c5e216c74804efc01ac0af2bd9f
+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 1481 SHA256 0068438b7f47983888a7d7c92da13a3b4de5cdf377d14b6e62fe990e852715c1 SHA512 9ed5d239b896c0e17965d3fefd830a8ae89da396de6eceb029bb1b1fb04e37372d7120a612eb6ea3663f2499d6d04c5672abe26a9cfe9e55c10d2051e77cb4b7 WHIRLPOOL d62c733f4f89bc8bae319f8ec10b847a9673356aca3fb9c4f1c587ea436ed100fff9842108521e65b21c2546b333bd2a61191914b31482ebdfb81a8727b56c3f
+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 936 SHA256 313d17b31c4aee42f4959f30e173390db2e73464ffb5996172db0197ca8123d2 SHA512 c5c6f3245f61bb5deb49438255215624c3286a73dfe6c7ef7f69fb60e497163c2d7766cc6fa14acbbc20505bc278a59afd946a95189d3b952ed817c98b93fd53 WHIRLPOOL f271ad1ad9a7b541420654d2c96f2ac61f0acb484963ac27892a0dbd1889789c721e23313f6f2b4787336531c63b3cd7715e53a19f5ad6f1ff29fba128d5a4bc
+DIST icinga-1.7.2.tar.gz 12946623 SHA256 86497cab06197f6df017e788e26b27bf1797b8c448fa90fa806c693bc30b6750 SHA512 220dc9dd3dd3ece28fc1a20979e89e7214f200848e1a81a1161eea903fa0d0ef0b44da21ece20b8b79216fe003736b320fbc25286f7d6e441522eefa43c6017c WHIRLPOOL a5a61485e9f5b8917b6182a50b671c74ce5576453760869263543c7cad38c370019866b5d01b534eea3c2783cf90233d6cfe5fe1e6ee86e5b9fa1ed4f104550e
+EBUILD icinga-1.7.2.ebuild 7411 SHA256 4c203df5027258b22fa106a2d9fdc3199d6a5ead2b0032b4bc8b3a22e83b86a0 SHA512 b38981e8613a89eb7ae8a24846522a46d8ed4628f3151df1cc57681162c9fc196e4c0c3344c0ffb94a864ef9e6760ae6b7f50f21421880f876ed09d068d42a54 WHIRLPOOL abd0901dd21a6d42267373769292b629f935e1a8804af0fbe1f24f214c289687e8f69cc1b37fa0a46863f1e29ae31cd887e9038de84477dd1b051c28dc542563
+MISC ChangeLog 5025 SHA256 b44ac49fa2dd1cf8daba995829f238f354b88b71ef38db044c3db6c206d94a81 SHA512 bd1ca4b5760b26bd9cae5c7107a4d55517c1e6365c601e15aa3e8a45ee5db17ac38bb4b45d9805e31a88446e16882dc06e65fc8ef7add4b92fe5c764c35606a7 WHIRLPOOL 6f713023bb9bc0c4f07a29c65645c4baaafb5e1276b17bb2d54280ee8a5d467fd802fa6edd8e750143e0d5d165b1134a89fab4a7ca18f1028131a4aedc3fe145
+MISC metadata.xml 656 SHA256 d3a2a2616d4a81e0443c3c093d696c9c16497d3f403a7c891ca1a618248cb1e6 SHA512 2ff9ada9593a3f0751ff6e157f3acb4035281340272a4d9f4cf1e0ba61b97ef629e041ae9edf2faf4e6ee11e6965eb70993ad3821a9a94dcfbfc8d8605f37ed7 WHIRLPOOL 9111ba6f92eefdbfcd0832def713aab3e85b4b0ccc2edc804bae648819b214f4e829bfff717d8e6017719966af048f48b190f9bcfc673fea134c8bdc8222bf86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQV3+9AAoJECRx6z5ArFrDDOYP/j2U3zri7Fj4eixwOfOR5ChJ
+1c6Sa72xUXly1lDt5NskeIR9+BxWEHT8vGpIg8MjBKe4auTJ6cz+j5exkE27zibW
+mrxbHTTSlDyZ9hpZX6LM7IOcu9xTAHNdgnE9OpK9dcqmz4FqhMKUqZHj6vsA9GXX
+ZEOXtdq84StBU7XDwO7/aJ4D1ZK0J/sOpf8kWTF/eKkcYAxW59QFhyK8/vKbEKTj
+YGYl4FFFKyf4fcDXm6HkkB7XmTSDoEe81B/+D665gDP8bTbxi3AghGzTLdoDzrpv
+1z2QLdDdXFzxu9Lg+2OE/51GKDeU018w1XIqZ584kIc0wu/EPNnBA7pnoMaRkDqG
+etaZAlMZwJ1KDrWo5XXMyYLlE2S6nA2BvoJansLsIjN2+Z2MxB7O+n0nykEgYAcD
+do8GaNvSkuysBbQJW2ePBhBDAB1onyCGTXoqFYloRQujXJh3CGV8RENYTp0HDkSd
+hF9rphmUyjgYZ29jyjOTILfnMpbzUfvERTIoWkUiHDBJmAJrJGcqxA0j0Dl+4QEX
+3OAZv8zyzPvv8JBkbskLJTAaLDVDnkgUCn+rHyuD+EHGRhCx9xsZnklUqYM8TEAB
+36tSbGsDPkpq4lk3V659H+FpOUzWGEvqY/pa3wA8mCFaOwpXpZRGD2f07NNCNpoH
+XAHmqSybBfq7OLYs8vTW
+=zSwD
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d
index 5ed3fb0..3eb213c 100755..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.4 2012/09/17 19:53:22 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.pid -- -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.pid
-	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 302a248..6ad019c 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.4 2012/09/17 19:53:22 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-r1.ebuild b/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
deleted file mode 100644
index bab1cbe..0000000
--- a/net-analyzer/icinga/icinga-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# 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-r1.ebuild,v 1.3 2011/12/29 15:59:11 prometheanfire Exp $
-
-EAPI=2
-
-inherit depend.apache eutils multilib toolchain-funcs
-
-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.6.1-r2.ebuild b/net-analyzer/icinga/icinga-1.6.1-r2.ebuild
deleted file mode 100644
index 5a1994f..0000000
--- 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.3 2012/03/09 10:00:55 phajdan.jr Exp $
-
-EAPI=2
-
-inherit depend.apache eutils multilib toolchain-funcs
-
-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.2.ebuild
index bdc227d..55c979b 100644
--- a/net-analyzer/icinga/icinga-1.7.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.7.2.ebuild
@@ -1,10 +1,10 @@
 # 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.3 2012/03/09 10:00:55 phajdan.jr 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
 
-inherit depend.apache eutils multilib toolchain-funcs versionator
+inherit depend.apache eutils multilib toolchain-funcs user versionator
 
 DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils"
 HOMEPAGE="http://www.icinga.org/"
@@ -16,18 +16,18 @@ 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"
+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 dev-lang/php[cgi] )
-		apache2? ( || ( dev-lang/php[apache2] dev-lang/php[cgi] ) )
+		lighttpd? ( www-servers/lighttpd )
 	)
 	!net-analyzer/nagios-core"
 RDEPEND="${DEPEND}
 	plugins? ( net-analyzer/nagios-plugins )"
+RESTRICT="test"
 
 want_apache2
 
@@ -49,12 +49,6 @@ src_configure() {
 	$(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
@@ -151,6 +145,10 @@ src_install() {
 			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
@@ -158,10 +156,6 @@ src_install() {
 		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