net-analyzer/icinga: New version of icinga, cleaner, thanks to Tommy[D]

svn path=/sunrise/; revision=11300

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 60f0f0e47cb4f4f955e6a00b414b59e86d8464e4..25727936b4ffab1e0ef1cffaaefbf7320848b038 100644 (file)
--- a/net-analyzer/icinga/ChangeLog
+++ b/net-analyzer/icinga/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Sep 2010; mthode <mthode@mthode.org> icinga-1.0.3.ebuild, metadata.xml:
+  New version of icinga, cleaner, thanks to Tommy[D]
+
   01 Sep 2010; mthode <mthode@mthode.org> -icinga-1.0.2.ebuild,
   +icinga-1.0.3.ebuild, +files/icinga-apache.conf, +files/icinga-conf.d,
   +files/icinga-init.d, +files/icinga-lighty.conf, +files/ido2db-conf.d,

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index c77b17bd8772c69516a2b78ee69dab214cbdc45a..fc96682b90805b690e6519e4d5b08527666daa24 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -6,6 +6,6 @@ AUX ido2db-conf.d 35 RMD160 a2bb1738720a56285da529fb18eeb60739ac817b SHA1 57ba29
 AUX ido2db-init.d 539 RMD160 e89e70f67d5accc7ae66b77d9bf61d2e1cc9d647 SHA1 17f9317bd21a5e5dfd41bbb19f50357b80ba9599 SHA256 e5b6a782475cbbde5b49720cdbcbf14958338baca510e78e508902360a479b72
 AUX metadata.xml 310 RMD160 c92afd2ac94d8a6950246be87547741d5416624c SHA1 2866924d3d59986a0e993755ff5eda4884ea2d0f SHA256 0c9cec7c42b1e5e488997f803ab32cd58ea9428bd57ac352ce0109c421067445
 DIST icinga-1.0.3.tar.gz 8583094 RMD160 74bb5022eb6708477128a418baec5324b7f07311 SHA1 07edc061fe88d36366a3408d7138699c287673df SHA256 ae67d10f81767b224fc2768ee58a328c88eda62676fcf5b26fee75e2f79939cd
-EBUILD icinga-1.0.3.ebuild 7223 RMD160 f09969308e4398d0dfecec30d2c6c4c7f3c9a153 SHA1 582cfbf6effe3bba368453789af825078d58d265 SHA256 e92301a47bc5d0bd03672e1f281801337aa06842a6d33dc74a0db6cd3b63eef0
-MISC ChangeLog 602 RMD160 785c5f460e6fc35f936d3f0f4ed18b528f5b074f SHA1 2d48fd6ed0948fa1dd9a266ee0de84eb491e70c7 SHA256 782bebf0acc67737e7073294d62fa0548b335edf0c5179d3c91a059ba511bdba
-MISC metadata.xml 606 RMD160 9eb6817db7cbca092fcafe184597663bb6a90aeb SHA1 92134b37a653b10431460a91e383ca15fd3ad5f9 SHA256 a2ed0f09f4efe7c9bd24681600504be30baa82c4f180ecd7aa724abe17296cf2
+EBUILD icinga-1.0.3.ebuild 6976 RMD160 7ad432cfb173389e47b5ca3408376b900d01c9fd SHA1 06420c3a2264073db65afc5a23a4af558ca1cf77 SHA256 7acbd7474c9f5017bc0b425defdd90232cc73318c8a8a5b93db961d6affd3edc
+MISC ChangeLog 733 RMD160 febb9f9fe30ec93e3058864b13a841eda4c0f1a9 SHA1 9eedb6c868e6c6f1f7894c07646efcec15b97ba9 SHA256 84dc452ed1663050aa3d7cdfdd7591fce9554e6bb8f4fbe6a196f5d158f45c55
+MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.0.3.ebuild b/net-analyzer/icinga/icinga-1.0.3.ebuild
index d01265d896abb82df04d7fc219a1c242935db29f..0281dd34f55150b44c149f3aeb65e2d98dd46377 100644 (file)
--- a/net-analyzer/icinga/icinga-1.0.3.ebuild
+++ b/net-analyzer/icinga/icinga-1.0.3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/icinga-core-3.1.0.ebuild,v 1.3 2009/02/24 17:07:42 dertobi123 Exp $
+# $Header:
+# /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/icinga-core-3.1.0.ebuild,v1.3 2010/09/10 17:07:42 dertobi123 Exp $
 
 EAPI=2
 
@@ -35,8 +36,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-#      local strip="$(echo '$(MAKE) strip-post-install')"
-#      sed -i -e "s:${strip}::" ${WORKDIR}/{cgi,base}/Makefile.in || die "sed failed in Makefile.in"
        if use api ; then
                sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile.in || die "sed failed in Makefile.in"
        fi
@@ -79,9 +78,6 @@ src_configure() {
                --localstatedir=/var/icinga \
                --sysconfdir=/etc/icinga \
                --libexecdir=/usr/$(get_libdir)/icinga/plugins
-       if use api ; then
-               sed -i -e 's/USE_ICINGAAPI=no/USE_ICINGAAPI=yes/g' Makefile || die
-       fi
        if use api ; then
                cd module/icinga-api
                econf --prefix=/usr \

diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index 4eebbd5158f2a7809579df47a4d60334bba89ad6..6cfa5d438fc345a7754aac24ab92195a281cd4ec 100644 (file)
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -11,6 +11,6 @@
                <flag name="web">Adds generic web interface support</flag>
        </use>
        <maintainer>
-               <email>mthode@mthode.org</email>
+               <email>maintainer-wanted@gentoo.org</email>
        </maintainer>
 </pkgmetadata>