net-analyzer/icinga: removed virtual/mailx and replaced with real packages

svn path=/sunrise/; revision=11853

diff --git a/net-analyzer/icinga/ChangeLog b/net-analyzer/icinga/ChangeLog
index 8c6e86beebdeddb42a976d92e2f343556f225b8f..9ebbe94660ee33220868ce21b86633c76b0415de 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: $
 
+  30 Mar 2011; mthode <mthode@mthode.org> -icinga-1.3.0-r1.ebuild,
+  +icinga-1.3.0-r2.ebuild:
+  removed virtual/mailx and replaced with real packages
+
   10 Mar 2011; mthode <mthode@mthode.org> -icinga-1.3.0.ebuild,
   +icinga-1.3.0-r1.ebuild:
   updated --with-cgiurl=/cgi-bin to --with-cgiurl=/icinga/cgi-bin for multi

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index d54d4b6d4f7b40b462904bc9fa4d918493fd8585..999ec91fe70365efba53fc7baea4d3b13764b2bc 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.0.tar.gz 12084804 RMD160 2b685c2e5ba6273d917d5b4cb3e22350184b752c SHA1 e6cce4e6d4c86e056e5331900dae8898273dc7e1 SHA256 eec3b6ffcc7bdac7c84d08d6bc8d899ca3ccfd40f063f0fdc0fb5e386ee086f4
-EBUILD icinga-1.3.0-r1.ebuild 5886 RMD160 490578fd906016db1c8fdf8ab55408bf3888ee31 SHA1 5c223ac6eccd748bf924f793dfdbac01e6181cba SHA256 221179169718bce6f6840298153b8b620ca82585fa51dda70310a74dc7865796
-MISC ChangeLog 2847 RMD160 e5d9b940f04b3cd4791fc69d5aaac9853b2a1dac SHA1 af0013753bb645879404e58a1527dfbf3d18373d SHA256 5055048114a3db88add982d89c06d727484b49d5dcc6a2f909d1e07a8c1e2148
+EBUILD icinga-1.3.0-r2.ebuild 5935 RMD160 2843aec6e2a863761b6834260a0ceb3b72168633 SHA1 48af3974631e2359b855e966f0c5c7b71072f7f2 SHA256 0235343ab576f49e441e703ccafee2833128cb330e52d9ce667f5741e633e5f8
+MISC ChangeLog 2998 RMD160 decbdbcd3b6fc2e4efcf91f5e33e790b62a4927b SHA1 6f624fbff9962c9c8ca002f9a7186cf6b7c4b4cb SHA256 09902fc6034aeb948da80057c550434bde9675a60ea3b94e0ba83b45865a90d4
 MISC metadata.xml 617 RMD160 48225567d6faa1646f8600b2c2a924bfecb34bfe SHA1 1332e6a76891016de22c669c834ffbc47d0986a1 SHA256 c97b32c33007fddc24119f96f12df720da5232bb459e5f1c3970e658fd08089e

diff --git a/net-analyzer/icinga/icinga-1.3.0-r1.ebuild b/net-analyzer/icinga/icinga-1.3.0-r2.ebuild
similarity index 98%
rename from net-analyzer/icinga/icinga-1.3.0-r1.ebuild
rename to net-analyzer/icinga/icinga-1.3.0-r2.ebuild
index a1313f3d15519c443e9ca3f9e7319e828b8192b3..fde4a442faf9bd090624e03366b61129d34671de 100644 (file)
--- a/net-analyzer/icinga/icinga-1.3.0-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.3.0-r2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+apache2 api 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
+       ||      (   mail-client/mailx mail-client/nail net-mail/mailutils )
        web? (
                media-libs/gd[jpeg,png]
                lighttpd? ( www-servers/lighttpd dev-lang/php[cgi] )