Add libnet USE flag. Fixes bug #348783. Thanks to Denis Kaganovich for reporting.

Package-Manager: portage-2.1.9.29/cvs/Linux x86_64

4 files changed, 21 insertions, 22 deletions

diff --git a/sys-cluster/resource-agents/ChangeLog b/sys-cluster/resource-agents/ChangeLog
index dc114b6aaf50..8e491e5e77ad 100644
--- a/sys-cluster/resource-agents/ChangeLog
+++ b/sys-cluster/resource-agents/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/resource-agents
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.4 2010/08/28 09:16:01 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/ChangeLog,v 1.5 2011/01/10 09:22:14 ultrabug Exp $
+
+*resource-agents-1.0.3-r1 (10 Jan 2011)
+
+  10 Jan 2011; Ultrabug <ultrabug@gentoo.org> -resource-agents-1.0.3.ebuild,
+  +resource-agents-1.0.3-r1.ebuild, metadata.xml:
+  Add libnet USE flag. Fixes bug #348783. Thanks to Denis Kaganovich for
+  reporting.
 
   28 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
   resource-agents-1.0.3.ebuild:
diff --git a/sys-cluster/resource-agents/Manifest b/sys-cluster/resource-agents/Manifest
index 36f37d4712e5..578a20708223 100644
--- a/sys-cluster/resource-agents/Manifest
+++ b/sys-cluster/resource-agents/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.3-docs.patch 1164 RMD160 b557476f4d8867ddb7bdf7aae786c7b8a414a6a7 SHA1 91cb5a505c069bfc42dfef966240286a7a66c761 SHA256 92f061cf7926e6d93ed993d94df1e360be3a4f88e54cdf0134d14d0d054b6350
 AUX 1.0.3-respect_cflags.patch 316 RMD160 18c50ad77c7192840a14aaa3a6487cca8d5f2028 SHA1 1d6f2a42c83f9439934811f0a0a4d3c168c411a9 SHA256 62cee339be61f5d1fd0cf0e335687633e19e38f84feb4ae2de52547269f9fce2
 DIST agents-1.0.3.tar.bz2 247634 RMD160 f3596d15f50567abd336161fe31415e8017b48ec SHA1 30b6f21f4023736b64ed42c44eb20eca7eb805b7 SHA256 09b58332e34cf128c8d53d5bb4b3f61e402c2e0c0c809f5abae53ca144ad101e
-EBUILD resource-agents-1.0.3.ebuild 1535 RMD160 10d5216add4873475a66d67d3ecf87edb5481bf6 SHA1 fd1b052c149959bdb12814050f8ce8629411118f SHA256 658c6284922f41840d835d8fd9210ad35ef6d2cd432db698f350eac5992dc65e
-MISC ChangeLog 916 RMD160 212c04329c7a479177db1a669a5c51217c48a17f SHA1 587271ad64592bb7c905181e0c63574a7b95c1e8 SHA256 04a91c9d151ddc8debf3e3d45d9c15d4309e43689baad5522c25ef83a260c986
-MISC metadata.xml 529 RMD160 ddd9fc6fb47722205b664b723a1122db94e31552 SHA1 d7b761651a5be339077a4ddd15ca93f3372aeafa SHA256 bbeee3e839b4ebf70e155612edecbad7285ae24a4ee320409ff78e586b48e6c2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyKi5gACgkQIiMqcbOVdxR39QP/f8WWr2LKbLm+SbiqQl3BTaIn
-7gkBeUlyHeLxt1zg4aK0klGh8V1hKNJDXEk/WhzSRrUGLuKzaG4TOS+R8fD7ISTQ
-NW4Bt7cqyfE4PZv/AFguWqRIKrA0AOLLuorQ9cpbnei/jUlHvYUXzqYHQ1VEf3op
-5bwgArLNyCQVS4/OKQg=
-=thQo
------END PGP SIGNATURE-----
+EBUILD resource-agents-1.0.3-r1.ebuild 1584 RMD160 95078fae2298df360fcd6d9e45f4ee43bc140df0 SHA1 8aad7a40afce5e383d3949aeb633a858067c7936 SHA256 a1f3d08d80d7d71fdc40169a5d6e1e9029618f5bf6f2b09041721def8ae5e409
+MISC ChangeLog 1169 RMD160 05e2c7c7da73ab52ce050fd73d4a5e3fc2a90a3c SHA1 53134f8d880f4cd53875ffb6adfc8fc1d017c439 SHA256 1eceda302584f5447fadff3f1c346b6e4e5aff413c0bb74600556ea9d8b3e874
+MISC metadata.xml 613 RMD160 8158778c17cf3fdf40d31dfceea71688ca74cf42 SHA1 66d0ef2208a0aa67350258136489ff1925eb64a6 SHA256 3fe9427063dace4f990bef1bffe462793c18c7ab1eee97fb3cc543ac22a416d0
diff --git a/sys-cluster/resource-agents/metadata.xml b/sys-cluster/resource-agents/metadata.xml
index 9716860e4017..fc14aaf4f652 100644
--- a/sys-cluster/resource-agents/metadata.xml
+++ b/sys-cluster/resource-agents/metadata.xml
@@ -9,4 +9,7 @@
 		failure. Previously, they were a part of the then-monolithic Heartbeat 
 		project, and had no collective name.
 	</longdescription>
+	<use>
+		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild b/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild
index c8b33f6dd358..1bd1111aec1f 100644
--- a/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.3.ebuild,v 1.4 2010/08/28 09:16:01 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/resource-agents/resource-agents-1.0.3-r1.ebuild,v 1.1 2011/01/10 09:22:14 ultrabug Exp $
 
 EAPI="2"
 
@@ -14,11 +14,12 @@ SRC_URI="http://hg.linux-ha.org/agents/archive/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc"
+IUSE="doc libnet"
 
 DEPEND="sys-apps/iproute2
 	sys-cluster/cluster-glue
-	!<sys-cluster/heartbeat-3.0"
+	!<sys-cluster/heartbeat-3.0
+	libnet? ( <net-libs/libnet-1.1.5 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/Cluster-Resource-Agents-${MY_P}"
@@ -42,7 +43,7 @@ src_configure() {
 		--libdir=/usr/$(get_libdir) \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		$(use_enable doc) \
-		--enable-libnet
+		$(use_enable libnet)
 }
 
 src_install() {