Add libnet USE flag. Related to bug #348783.

(Portage version: 2.1.9.29/cvs/Linux x86_64)

4 files changed, 16 insertions, 96 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/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>