net-analyzer/icinga: added libexecdir conditional on plugins use flag

svn path=/sunrise/; revision=11873

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 5603c176524d5066f223cd8b8ab7374f24d7d9d4..76df5904e9d9f6529636178ea03bb0cc3e916372 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2011; mthode <mthode@mthode.org> -icinga-1.3.1-r1.ebuild,
+  +icinga-1.3.1-r2.ebuild:
+  added libexecdir conditional on plugins use flag
+
   07 Apr 2011; mthode <mthode@mthode.org> -icinga-1.3.1.ebuild,
   +icinga-1.3.1-r1.ebuild:
   added die statements and revbump

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index 4b0c0934e686269447424fd832b049a63c32d42d..dcd18c92b2cc9fdbbbf243f7d266c082685219f5 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -5,6 +5,6 @@ AUX icinga-lighty.conf 465 RMD160 34de76ad07f95e2282ae3e192b35cd9310ef2b4e SHA1
 AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29aec3f80db9577da4aca34d228487dd12c1 SHA256 6cbdf0eb7070121bd466c221d73cf6ca05a4af5caa1d4abedf62828edd1b1372
 AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
 DIST icinga-1.3.1.tar.gz 12158923 RMD160 b0b82ef3e9eb999493af3ce26f9252661d34fdaa SHA1 fb2e87ed5edbb86d9476bce9487811c7b2ed1f16 SHA256 b6eec308091a9b87b885e57e41184c496de0894660dd833074ecf4dd2cf180e0
-EBUILD icinga-1.3.1-r1.ebuild 6135 RMD160 38b84f4fe4c701a829106d9c40249a12902c23ed SHA1 e361e48b36b64a415026ae62bf4c9446ec7c83ff SHA256 38cd6c2dd3b2ac1f56d2e7ef87ed4601126a9861940c8ea0a737b806066fd9e5
-MISC ChangeLog 3414 RMD160 9f55a90701d84e1486eed1babbafb27d137d3096 SHA1 7f75e897d80be367e077585f6473ee5d6ecf40b1 SHA256 ca488a8c334dc4deb13f4b985bbe421cd5625131cc75cd5b313fe3067e5298b8
+EBUILD icinga-1.3.1-r2.ebuild 6220 RMD160 691c1c8accf8c9a4b74dbd517ed5bc221e2cbd19 SHA1 e122a1787c103e8a4bfaed772c903b0d00f6fcd0 SHA256 c221f6053fcae654a2283b682fc5195649024f10e3b48d055fc47419ee7ffd11
+MISC ChangeLog 3560 RMD160 e87f2e397cb96e9627eb4c50d53c40228348088e SHA1 d906961eee995423a84e7ed7d9b959a61418a8b7 SHA256 0733dceb85bdd63581d310d59643d915354c0a34566b970951ed277f37883ae4
 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.3.1-r1.ebuild b/net-analyzer/icinga/icinga-1.3.1-r2.ebuild
similarity index 96%
rename from net-analyzer/icinga/icinga-1.3.1-r1.ebuild
rename to net-analyzer/icinga/icinga-1.3.1-r2.ebuild
index 11a05d6a3b9103213010e7a59bfe4580483b047a..8b31d888d4157d50b7c9dd2f51a86e14ce159b33 100644 (file)
--- a/net-analyzer/icinga/icinga-1.3.1-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.3.1-r2.ebuild
@@ -98,8 +98,13 @@ src_configure() {
        --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
        --datarootdir=/usr/share/icinga/htdocs
        --localstatedir=/var/icinga
-       --sysconfdir=/etc/icinga
-       --libexecdir=/usr/$(get_libdir)/icinga/plugins"
+       --sysconfdir=/etc/icinga"
+
+       if use plugins ; then
+               myconf2+= "--libexecdir=/usr/$(get_libdir)/nagios/plugins"
+       else
+               myconf2+= "--libexecdir=/usr/$(get_libdir)/icinga/plugins"
+       fi
 
        if use !apache2 && use !lighttpd ; then
                myconf2+=" --with-command-group=icinga"
@@ -176,11 +181,11 @@ src_install() {
 
        mkdir -p "${D}"/var/log/icinga || die "Failed mkdir of /var/log/icinga"
 
-       fowners -R icinga:icinga /etc/icinga /var/icinga /var/log/icinga || die "Failed chown of /etc/icinga"
+       fowners -R icinga:icinga /etc/icinga /var/icinga /var/log/icinga || die
 
        sed -i -e 's:^log_file=.*:log_file=/var/log/icinga/icinga.log:' "${D}"/etc/icinga/icinga.cfg || die "Failed sed of /etc/icinga/icinga.cfg"
 
-       fowners -R root:root /usr/$(get_libdir)/icinga
+       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 {} +