diff options
| -rw-r--r-- | net-analyzer/icinga/ChangeLog | 4 | ||||
| -rw-r--r-- | net-analyzer/icinga/Manifest | 9 | ||||
| -rw-r--r-- | net-analyzer/icinga/files/icinga-conf.d | 4 | ||||
| -rw-r--r-- | net-analyzer/icinga/files/icinga-init.d | 3 | ||||
| -rw-r--r-- | net-analyzer/icinga/files/metadata.xml | 9 | ||||
| -rw-r--r-- | net-analyzer/icinga/icinga-1.0.3.ebuild | 60 |
6 files changed, 33 insertions, 56 deletions
diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog index 25727936b..436b4ed9c 100644 --- a/net-analyzer/icinga/ChangeLog +++ b/net-analyzer/icinga/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Sep 2010; mthode <mthode@mthode.org> icinga-1.0.3.ebuild, + files/icinga-conf.d, files/icinga-init.d, -files/metadata.xml: + New version of icinga, cleaner, thanks to Tommy[D] and chithead + 10 Sep 2010; mthode <mthode@mthode.org> icinga-1.0.3.ebuild, metadata.xml: New version of icinga, cleaner, thanks to Tommy[D] diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest index fc96682b9..5b25c95f0 100644 --- a/net-analyzer/icinga/Manifest +++ b/net-analyzer/icinga/Manifest @@ -1,11 +1,10 @@ AUX icinga-apache.conf 377 RMD160 bd009d51035802deb5efd3aaf0b726ca7ef34e2e SHA1 7ba572b8ed52695a8278cc5d57df3fd8cf59dca8 SHA256 e2a17742d8a74f31fd038cbf33533ccdeaed8604cfa026d0fdbb24d3a46e30f9 -AUX icinga-conf.d 397 RMD160 4f0b656cd8c74e0132080bdea6c040e5cc5eb23f SHA1 664a80063a83b7e5bfac8bef066dd3f32b149925 SHA256 076c12f7822124c47fb3634164c381fbc5dce51f45ac9f9a8e389244cab29ad3 -AUX icinga-init.d 1431 RMD160 3369ca897115bb34d07710daa3b12089f89c63dc SHA1 7569c98c49df48745b15489dbe6efad1e243008f SHA256 c2b7b4e15fe2514a62a97d1ec167796c19df8068c9639c74b06bbeaf25d63626 +AUX icinga-conf.d 178 RMD160 3e8a497619b16ce9e33a8d6ff824b5e5cc8f9c63 SHA1 7824227018db79beb7984cdedda7345fe54f70aa SHA256 68dde656424fc57e66babceb3c6623a235fac8bf1f9cd885138e31878db740db +AUX icinga-init.d 1207 RMD160 fe0f17d9247da24208281077b6cb46089dc9f22f SHA1 58c8fc60da8f4fb5a7d29a8be83948e11a8719e4 SHA256 d9014a1ce527282e5a404e602b3f08e0a4b842e02bd2fcdd8fffb8e67922557d 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 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 6976 RMD160 7ad432cfb173389e47b5ca3408376b900d01c9fd SHA1 06420c3a2264073db65afc5a23a4af558ca1cf77 SHA256 7acbd7474c9f5017bc0b425defdd90232cc73318c8a8a5b93db961d6affd3edc -MISC ChangeLog 733 RMD160 febb9f9fe30ec93e3058864b13a841eda4c0f1a9 SHA1 9eedb6c868e6c6f1f7894c07646efcec15b97ba9 SHA256 84dc452ed1663050aa3d7cdfdd7591fce9554e6bb8f4fbe6a196f5d158f45c55 +EBUILD icinga-1.0.3.ebuild 6359 RMD160 9a3a7ebaac53dfc2b685e18bc4ead7885d2930fa SHA1 b5b364fbc1f4486946a6372cb05ce2dc4136fad9 SHA256 daed5fae1f604434c31c7de8ab4fe8ba8f783b189ec30f23269aa9152f5b9b13 +MISC ChangeLog 928 RMD160 9fd6886f12242a9a780c2402ab0cb2455ea9c463 SHA1 d098d6beafbe4992669e8b6d5ea638c1125ace41 SHA256 ca88a90240c9885d19f1f83a492cfcb62254c0e5046844223be6ba0d6de82a91 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d index b8bd03bb0..da5b324b3 100644 --- a/net-analyzer/icinga/files/icinga-conf.d +++ b/net-analyzer/icinga/files/icinga-conf.d @@ -1,7 +1,3 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $ - # Distributed monitoring users will want to configure here the ip/hostname of the central server. # It will be used by submit_check_result_via_nsca. NAGIOS_NSCA_HOST="localhost" diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d index 06817bd04..f734f714b 100644 --- a/net-analyzer/icinga/files/icinga-init.d +++ b/net-analyzer/icinga/files/icinga-init.d @@ -1,7 +1,4 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga-core/files/icinga3,v 1.1 2008/04/27 18:41:25 dertobi123 Exp $ opts="${opts} reload checkconfig" diff --git a/net-analyzer/icinga/files/metadata.xml b/net-analyzer/icinga/files/metadata.xml deleted file mode 100644 index 3b6eacfab..000000000 --- a/net-analyzer/icinga/files/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>no-herd</herd> - <longdescription lang="en">A rebuild of nagios from the ground up</longdescription> - <maintainer> - <email>mthode@mthode.org</email> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/icinga/icinga-1.0.3.ebuild b/net-analyzer/icinga/icinga-1.0.3.ebuild index 0281dd34f..e52b86009 100644 --- a/net-analyzer/icinga/icinga-1.0.3.ebuild +++ b/net-analyzer/icinga/icinga-1.0.3.ebuild @@ -1,7 +1,6 @@ # 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,v1.3 2010/09/10 17:07:42 dertobi123 Exp $ +# $Header: $ EAPI=2 @@ -44,64 +43,55 @@ src_prepare() { src_configure() { local myconf - if use perl ; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - myconf="${myconf} --disable-statuswrl $(use_enable idoutils) $(use_enable ssl)" - - if use debug; then - myconf="${myconf} --enable-DEBUG0" - myconf="${myconf} --enable-DEBUG1" - myconf="${myconf} --enable-DEBUG2" - myconf="${myconf} --enable-DEBUG3" - myconf="${myconf} --enable-DEBUG4" - myconf="${myconf} --enable-DEBUG5" - fi + 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" if use !apache2 && use !lighttpd ; then - myconf="${myconf} --with-command-group=icinga" + myconf+=" --with-command-group=icinga" else if use apache2 ; then - myconf="${myconf} --with-command-group=apache" - myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" + myconf+=" --with-command-group=apache" + myconf+=" --with-httpd-conf=/etc/apache2/conf.d" elif use lighttpd ; then - myconf="${myconf} --with-command-group=lighttpd" + myconf+=" --with-command-group=lighttpd" fi fi - econf ${myconf} \ - --prefix=/usr \ + myconf+=" --prefix=/usr \ --bindir=/usr/sbin \ --sbindir=/usr/$(get_libdir)/icinga/cgi-bin \ --datarootdir=/usr/share/icinga/htdocs \ --localstatedir=/var/icinga \ --sysconfdir=/etc/icinga \ - --libexecdir=/usr/$(get_libdir)/icinga/plugins + --libexecdir=/usr/$(get_libdir)/icinga/plugins" + + econf ${myconf} if use api ; then cd module/icinga-api - econf --prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin \ - --datarootdir=/usr/share/icinga/htdocs \ - --localstatedir=/var/icinga \ - --sysconfdir=/etc/icinga \ - --libexecdir=/usr/$(get_libdir)/icinga/plugins + econf ${myconf} fi } src_compile() { + tc-export CC - emake CC=$(tc-getCC) icinga || die "make failed" + emake icinga || die "make failed" if use web ; then - # Only compile the CGI's if "web" useflag is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis || die + emake DESTDIR="${D}" cgis || die fi if use idoutils ; then - # Only compile IDOUtils if "idoutils" useflag is set. - emake CC=$(tc-getCC) DESTDIR="${D}" idoutils || die + emake DESTDIR="${D}" idoutils || die fi } |