From: Kacper Kowalik <xarthisius@gentoo.org>
Date: Sun, 20 Jun 2010 21:58:50 +0000 (+0000)
Subject: Respect multilib in ocf scripts path
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3d13087164220b3a9eeca68d4746325674944453;p=gentoo.git

Respect multilib in ocf scripts path
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index ae4ce10615bc..695f62292132 100644
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/cluster-glue
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.1 2010/06/20 21:29:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.2 2010/06/20 21:58:50 xarthisius Exp $
+
+  20 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  cluster-glue-1.0.5.ebuild:
+  Respect multilib in ocf scripts path
 
 *cluster-glue-1.0.5 (20 Jun 2010)
 
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 9802a357d557..3a00ae9544e5 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -5,15 +5,15 @@ AUX 1.0.5-docs.patch 1329 RMD160 e3617a9ce4b9ca562328d81b4563bb2ab82324c4 SHA1 0
 AUX 1.0.5-respect_cflags.patch 287 RMD160 b61f719213f4d11fd43d9b6444201d26048de468 SHA1 e0a41227a9f463d5f431d64c240746a3587dcdd7 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e
 AUX heartbeat-logd.init 950 RMD160 5dc08b3ddc801c0c8cd681ec370ecc4dbc2d107a SHA1 40379cb84e0c2e0b752208b8d7964bbefb2cf5ee SHA256 c074b3875a1cfb03cfa48a6229e4cc3058d92a21d64b84c3b68c983e64e63921
 DIST glue-1.0.5.tar.bz2 431365 RMD160 3f62d6014b3717379cd5fe8f67da91d5e1d42ac3 SHA1 44606b59a4d9ca38a1765f0589efd6e794226a86 SHA256 c437a04494850b79c094f7e84d396e917ec09d9a2fdfb7c11f3b420741ea91a2
-EBUILD cluster-glue-1.0.5.ebuild 2100 RMD160 d0f8aadbec42b1cb84237ae476c8c0dd03e7b2b5 SHA1 c800f4ae118a5a58fea28d965b891a8b634e073a SHA256 da7f7f396524fab555aea21219744d3b12a1d6b25e139d607bad1afcc236d61e
-MISC ChangeLog 528 RMD160 a86a2aba32405806dbf25704f911b8d43a5e98f5 SHA1 85d779aa2540d055ea0923fe25d3dffa7bf3cf5d SHA256 4a0a65cc83d865b0f6b185fe84c602fdc19bbc5ec8ca4740dbc32c54019024b2
+EBUILD cluster-glue-1.0.5.ebuild 2143 RMD160 005e811dd35b6a75091c8873ceb362782abd9baf SHA1 4f488f081d5b4a6d4107517f03b653f5f20194ce SHA256 50d6a826b40734b70880a207d42fb86bede9f2ffc239c1f523518c45d2038d50
+MISC ChangeLog 651 RMD160 464334d11218ba881ff1689b35ef18a33cdc4248 SHA1 5eef74e6d48335a66d782333f09d4daf25d3ab8c SHA256 ab5928a34816fe7d611eb7370b0e6ebbb333225102c676daf13d48e54d333cf4
 MISC metadata.xml 308 RMD160 095932b8c707069c5069c288a5b9bcf146c8c863 SHA1 360fe0295835f8e00e4cdf035105e50d8b359a8a SHA256 c41cec193d39d568f83fad441120f0c7689a22a32752a833d3b2b81616fe5463
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkweiDsACgkQIiMqcbOVdxQ73QQAn2iAEhEHyN/MT/fGpDvjMhjj
-GanGHV77UgNtAqpoqtzqbh20A1n2m15zTM/ff6Y0wxkjuONUWdJRuqxm7DJoR+Ci
-76+Tuja4cVi3AicZX40ycEemexUowB6HwgBBS4df/hHvG7cqZzblMjuZQYpz4ZQg
-Cu0z8OxcuKR/QrZDb8k=
-=fSOG
+iJwEAQECAAYFAkwejyQACgkQIiMqcbOVdxTUEQP/f5imSSAvtG+I3WG8pVnOJogJ
+pJzpi/iw7I+3CARTPtZ2w/ZzRwUeL36Ryem3dAWiKEr9Mb1jqf9ZxrDnR1AtBvlo
+wZTLT5uOkDGTUBA5n/HQMEX+1ZB6ARIaJ4UwnMsyx/VnUerK/8MCqMPfAXtj8s1I
+fR1om/P4WtzXKROmfyc=
+=oP6i
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild
index cc0c44d08564..9624b9cc4f8d 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild,v 1.1 2010/06/20 21:29:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.5.ebuild,v 1.2 2010/06/20 21:58:50 xarthisius Exp $
 
 EAPI="2"
 
@@ -51,6 +51,7 @@ src_configure() {
 		--docdir=/usr/share/doc/${PF} \
 		--enable-libnet \
 		--localstatedir=/var \
+		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		--sysconfdir=/var \
 		${myopts} \
 		--with-group-id=65 --with-ccmuser-id=65 \