Add libnet USE flag. Related to bug #348783.

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

5 files changed, 19 insertions, 113 deletions

diff --git a/sys-cluster/cluster-glue/ChangeLog b/sys-cluster/cluster-glue/ChangeLog
index f323470cb63c..0430c8aef462 100644
--- a/sys-cluster/cluster-glue/ChangeLog
+++ b/sys-cluster/cluster-glue/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2010/12/12 09:49:31 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/ChangeLog,v 1.12 2011/01/10 09:28:38 ultrabug Exp $
+
+*cluster-glue-1.0.7-r1 (10 Jan 2011)
+
+  10 Jan 2011; Ultrabug <ultrabug@gentoo.org> -cluster-glue-1.0.6-r1.ebuild,
+  -cluster-glue-1.0.7.ebuild, +cluster-glue-1.0.7-r1.ebuild, metadata.xml:
+  Add libnet USE flag. Related to bug #348783.
 
 *cluster-glue-1.0.7 (12 Dec 2010)
 
diff --git a/sys-cluster/cluster-glue/Manifest b/sys-cluster/cluster-glue/Manifest
index 4b56f60e3038..21e69b69e8a5 100644
--- a/sys-cluster/cluster-glue/Manifest
+++ b/sys-cluster/cluster-glue/Manifest
@@ -1,21 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.5-docs.patch 1329 RMD160 e3617a9ce4b9ca562328d81b4563bb2ab82324c4 SHA1 08c689eebdee966512721328277ea7f828a6702e SHA256 27d854f18b0830b9f2ac0161a244a06edc04da0fa4661d81dc171e07e3efa24b
 AUX 1.0.5-respect_cflags.patch 287 RMD160 b61f719213f4d11fd43d9b6444201d26048de468 SHA1 e0a41227a9f463d5f431d64c240746a3587dcdd7 SHA256 be7f2c9cbfc8201118abbdb2aeb1cf6d9aca2c586ae7a6d55963ee3143d9f71e
 AUX heartbeat-logd.init 953 RMD160 7319d87e690f2309c9b76a9cd52f96c0754b5362 SHA1 cd324adbc95b65bf42eafed4a3aa6a9709395719 SHA256 c174d2767c7cee63d77436c8e533aba7d6856af398c82881c7ba3758eba38e7b
-DIST glue-1.0.6.tar.bz2 433393 RMD160 d67d7423289a5005d17026a8c5544df34c0d7b84 SHA1 61a8cb76f6d3ff8239efe2b93fdd7485299642bc SHA256 f2a6cc54ab6789e0dba8ddcf51904b5a82d7914d332ca6b717592f650cb53e8f
 DIST glue-1.0.7.tar.bz2 444765 RMD160 b3e0cbfc98815d2f4adf9c6f64276b2f5b7df494 SHA1 f02ab98686a3a89879e96d1e3846033bb96daf2d SHA256 dcb2500d049476142204491113ff8eeeda210ca26530aa982ff3896bb65a84c7
-EBUILD cluster-glue-1.0.6-r1.ebuild 2112 RMD160 1620fa810e76449a58e2e93785234da119241ddf SHA1 3d7d47ed2bae60d142a4a3513597a215a14e5ddc SHA256 38bdca6cc02c475686448329990f602852d024784e68c3c74c3453c2911bf6d0
-EBUILD cluster-glue-1.0.7.ebuild 2115 RMD160 9c470fa14bf61060b3c6e2634ca1c4eaaeda6bdc SHA1 21ab3550283ff2fd4b6851e91ddf8b76e33b328e SHA256 0702074bf41397e7b02f7688193279454bc7d880d69562da259f017160c31bd9
-MISC ChangeLog 2079 RMD160 008b9bc7c3c2ef43f64901c302c9303271fccb52 SHA1 0623e85f2a29567dbc9a2d4224b7aad488420898 SHA256 4213284a512cb3d3b318b4c03d134506ad935800b5f755c03371d23aa6a1b738
-MISC metadata.xml 305 RMD160 f33838d567e507a33269ba73a0508e4ca2c4fedd SHA1 fc5e5ac5a2b1a39a701cbb9b3f15ba09f25c86bf SHA256 e38c55408c34abf73aa9d163e46433ed20d6e3542ac679663c918c456cccec64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAk0EmrQACgkQIiMqcbOVdxQX2QP9EbqMdRQcbv3G1an50/GLVZvB
-dnjA4K5ob/FzDj4RC7yyQZP7HQBB5rfO8p6IOKHY23YpaWIksxt2ZSxK2xnGM5SG
-HCf3hupflLETJDDt77CUptFc8MpAG796bfwmQal3c4rg+yjZPtb+JmA6JPiycIAc
-UTnHkC096heHJnlrswA=
-=j7Jf
------END PGP SIGNATURE-----
+EBUILD cluster-glue-1.0.7-r1.ebuild 2143 RMD160 353152723fed4e50207ee263b9c44e8a4887778b SHA1 b3fedb8ae5533d0fa9f7dc6e7b756753ba88ad66 SHA256 645d8aa4e65776ad5683d27061d957421c82970343f4a5f9a5a1cd7b6f6daab0
+MISC ChangeLog 2315 RMD160 c8e808f21c89e5d147c71c3ff51a19eb7c41699a SHA1 c17ed131e37acc101956a59d80a1b54f8ad7ad2d SHA256 571dd1b721f8884f6ded4c6712e615dab498817441d1e92dd191ceeca0a22be1
+MISC metadata.xml 389 RMD160 a7af0e998611b03320fad189444f386071d99efd SHA1 04030858eda7bcce8e571071c05ead156d4645dc SHA256 a79cd659ed114ae7736e0fec3acfb66068ea9269eba534504afa382e84313bc3
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild
deleted file mode 100644
index af97e2493e11..000000000000
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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.6-r1.ebuild,v 1.2 2010/10/06 07:40:50 xarthisius Exp $
-
-EAPI="2"
-
-MY_P="${P/cluster-}"
-inherit autotools multilib eutils base
-
-DESCRIPTION="Library pack for Heartbeat / Pacemaker"
-HOMEPAGE="http://www.linux-ha.org/wiki/Cluster_Glue"
-SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="app-arch/bzip2
-	dev-libs/glib:2
-	net-libs/libnet:1.1
-	net-misc/curl
-	net-misc/iputils
-	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
-	dev-libs/libxml2
-	!<sys-cluster/heartbeat-3.0"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		)"
-
-S="${WORKDIR}/Reusable-Cluster-Components-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/1.0.5-docs.patch"
-	"${FILESDIR}/1.0.5-respect_cflags.patch"
-)
-
-pkg_setup() {
-	enewgroup haclient
-	enewuser  hacluster -1 /dev/null /var/lib/heartbeat haclient
-}
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myopts
-
-	use doc && myopts=" --enable-doc"
-	econf \
-		$(use_enable static-libs static) \
-		--disable-fatal-warnings \
-		--disable-dependency-tracking \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-libnet \
-		--localstatedir=/var \
-		--with-ocf-root=/usr/$(get_libdir)/ocf \
-		${myopts} \
-		--with-group-id=$(id -g hacluster) \
-		--with-ccmuser-id=$(id -u hacluster) \
-		--with-daemon-user=hacluster --with-daemon-group=haclient
-}
-
-src_install() {
-	base_src_install
-
-	dodir /var/lib/heartbeat/cores
-	dodir /var/lib/heartbeat/lrm
-
-	keepdir /var/lib/heartbeat/cores
-	keepdir /var/lib/heartbeat/lrm
-
-	# init.d file
-	cp "${FILESDIR}"/heartbeat-logd.init "${T}/" || die
-	sed -i \
-		-e "s:%libdir%:$(get_libdir):" \
-		"${T}/heartbeat-logd.init" || die
-	newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die
-	rm "${D}"/etc/init.d/logd
-}
-
-pkg_postinst() {
-	chown -R hacluster:haclient /var/lib/heartbeat/cores
-	chown -R hacluster:haclient /var/lib/heartbeat/lrm
-}
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.7.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.7-r1.ebuild
index cb45dbd25ef4..04b3490ea5af 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.7.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.7-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/cluster-glue/cluster-glue-1.0.7.ebuild,v 1.1 2010/12/12 09:49:31 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cluster-glue/cluster-glue-1.0.7-r1.ebuild,v 1.1 2011/01/10 09:28:38 ultrabug Exp $
 
 EAPI="2"
 
@@ -14,11 +14,11 @@ SRC_URI="http://hg.linux-ha.org/glue/archive/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="doc static-libs"
+IUSE="doc libnet static-libs"
 
 RDEPEND="app-arch/bzip2
 	dev-libs/glib:2
-	net-libs/libnet:1.1
+	libnet? ( <net-libs/libnet-1.1.5 )
 	net-misc/curl
 	net-misc/iputils
 	|| ( net-misc/netkit-telnetd net-misc/telnet-bsd )
@@ -52,11 +52,11 @@ src_configure() {
 
 	use doc && myopts=" --enable-doc"
 	econf \
+		$(use_enable libnet) \
 		$(use_enable static-libs static) \
 		--disable-fatal-warnings \
 		--disable-dependency-tracking \
 		--docdir=/usr/share/doc/${PF} \
-		--enable-libnet \
 		--localstatedir=/var \
 		--with-ocf-root=/usr/$(get_libdir)/ocf \
 		${myopts} \
diff --git a/sys-cluster/cluster-glue/metadata.xml b/sys-cluster/cluster-glue/metadata.xml
index 2eda9fbcf861..92bbba9697e8 100644
--- a/sys-cluster/cluster-glue/metadata.xml
+++ b/sys-cluster/cluster-glue/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<longdescription>Cluster Glue is a set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack.</longdescription>
+	<use>
+		<flag name="libnet">Force use of <pkg>net-libs/libnet</pkg></flag>
+	</use>
 </pkgmetadata>