Bug #320749: Fix multilib-strict usage.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/nagios-check_fail2ban/ChangeLog b/net-analyzer/nagios-check_fail2ban/ChangeLog
index 197e1415e5fbdf817a51292baaad35e4281bcc25..3e60d417758761c6efcb29538911271bb6c01dc6 100644 (file)
--- a/net-analyzer/nagios-check_fail2ban/ChangeLog
+++ b/net-analyzer/nagios-check_fail2ban/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nagios-check_fail2ban
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_fail2ban/ChangeLog,v 1.1 2010/05/12 08:47:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_fail2ban/ChangeLog,v 1.2 2010/05/20 17:20:49 robbat2 Exp $
+
+  20 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  nagios-check_fail2ban-2.ebuild:
+  Bug #320749: Fix multilib-strict usage.
 
 *nagios-check_fail2ban-2 (12 May 2010)
 

diff --git a/net-analyzer/nagios-check_fail2ban/Manifest b/net-analyzer/nagios-check_fail2ban/Manifest
index 1d9d2c77a81ec24bf114ff2b8923ecbb172d3938..52316d25954e176ddba213135420f723fc185e15 100644 (file)
--- a/net-analyzer/nagios-check_fail2ban/Manifest
+++ b/net-analyzer/nagios-check_fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST check_fail2ban-2.tar.bz2 1930 RMD160 589667c594a0d3c906b753c6e867acdb2c1a914f SHA1 6dad3457a571aa9b539ea0ed9e20d547449249a0 SHA256 d0763f9afda10c1157e21bc4a72ca6ae2f04ccab845a68a88b00add614c11449
-EBUILD nagios-check_fail2ban-2.ebuild 755 RMD160 042168d5d979b0bd1a5c50cf2f3dae229270dece SHA1 5eff9584f4f4819e59de686717710f0d0c37da63 SHA256 bc7d80d7c741b41d5c20d37bc6c4c7e07ef3b93797e9f14f70e0d7277f17c543
-MISC ChangeLog 399 RMD160 c8c04f2466f95ce46be97c508c00b547a30421f1 SHA1 c24c6ce0dbc1822ecf5f57e2520741ef682c7221 SHA256 78d306da550acd3b5cddf4b3b9e6fafad1fdedf68a3ad99eaa6bf9bda1b3b418
+EBUILD nagios-check_fail2ban-2.ebuild 828 RMD160 888b4806ec2d3d95d94092b8c4ba0adb3006aeeb SHA1 47fa7ea187246db12aafe13d0b34e010f4fe7676 SHA256 66f34d965480ee3d2f65b8baf7ae7ccd784e9cc6d8047f959b22b73d5669d67b
+MISC ChangeLog 530 RMD160 9d0b594af2913717d8743c71903362a12904395e SHA1 3ceab6af541e20bb1b5ac9cf114effae0152ae6f SHA256 296d899d8326443f0be0673759710b87fa7e696fd71817f69e88af422cf0fc00
 MISC metadata.xml 304 RMD160 ab24a8f6cf7ac062c49b522df183c30ca7b57dd3 SHA1 a09c5ff1d70ef123e9c7bf79ca26e6ff573c3e3a SHA256 31f8d4aa6d3308ff0662e7949801876205124d7303b5cb3e1da38a2dc7081fac

diff --git a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild
index ca800134873c9dde12ac6548490c596aeeb3b3bd..6873de536d60c70796826de16a0b173881177467 100644 (file)
--- a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild
+++ b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild,v 1.1 2010/05/12 08:47:16 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-2.ebuild,v 1.2 2010/05/20 17:20:49 robbat2 Exp $
 
 EAPI="2"
 
-inherit autotools
+inherit multilib autotools
 
 DESCRIPTION="A nagios plugin for checking the fail2ban daemon"
 HOMEPAGE="http://bb.xnull.de/projects/check_fail2ban/"
@@ -25,5 +25,9 @@ src_prepare() {
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake \
+               DESTDIR="${D}" \
+               nagiosdir="/usr/$(get_libdir)/nagios/plugins/" \
+               install \
+               || die "emake install failed"
 }

diff --git a/net-analyzer/nagios-check_mysql_health/Manifest b/net-analyzer/nagios-check_mysql_health/Manifest
index 507ab0ee0cd5b965881798000373c927afa7b799..079f405c5c3b4026301524367063ac786f7ec8a2 100644 (file)
--- a/net-analyzer/nagios-check_mysql_health/Manifest
+++ b/net-analyzer/nagios-check_mysql_health/Manifest
@@ -1,4 +1,4 @@
 DIST check_mysql_health-2.1.1.tar.gz 117690 RMD160 c6a9664bf066a60658d90f8c0987b0f7ce77899a SHA1 5923e27ec0ed6c8aa4307d1a14d2ea0275c6ab4b SHA256 a102a8778c5dc6a67535619af077b83bbe5f512804487a0369fe5ee42f2cbb67
-EBUILD nagios-check_mysql_health-2.1.1.ebuild 818 RMD160 5fb91eebd9d6ec68751b1db0c469bbb087657366 SHA1 d9fd896a166f4d220852d119b434a714e9d42772 SHA256 ab28ef76973b97553056972b8121b6d0fc29a9a24881a4e19e4f451449d3cf20
-MISC ChangeLog 423 RMD160 a7176571b0afe915ed135eb47c157148589b9605 SHA1 6df2f6f7f68299f164c601faab12d9ad9e258245 SHA256 23ba46c27790978df204a63380557984f665fa31a3d692eb601f5771bd9d9000
+EBUILD nagios-check_mysql_health-2.1.1.ebuild 838 RMD160 db4cb3478e19ef303e961d6c08b96a1da893a81f SHA1 9c30e7b9a30f3aed98c66d446407297f9c0b8c9e SHA256 f2bedfa7713dff913317e7c63d1e8736cb46fc92590e6a1390191ecc3761f7c1
+MISC ChangeLog 543 RMD160 e0267b65d49337cd67a7850d808087f0fbd55a0c SHA1 ae1c7f2cc6ff9d1cdd99099176bda6cf138fc952 SHA256 b2c7f441aa6a3896285f9c559489af9c2ec452633b8370fe75ed1da89dc3cd6e
 MISC metadata.xml 304 RMD160 ab24a8f6cf7ac062c49b522df183c30ca7b57dd3 SHA1 a09c5ff1d70ef123e9c7bf79ca26e6ff573c3e3a SHA256 31f8d4aa6d3308ff0662e7949801876205124d7303b5cb3e1da38a2dc7081fac