--- heartbeat-2.0.7-r2.ebuild	2008-03-06 15:07:05.000000000 -0500
+++ proposed	2008-04-25 10:39:49.000000000 -0400
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.7-r2.ebuild,v 1.6 2008/03/06 20:04:24 wolf31o2 Exp $
 
-inherit flag-o-matic eutils
+inherit eutils
 
 DESCRIPTION="Heartbeat high availability cluster manager"
 HOMEPAGE="http://www.linux-ha.org"
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 -mips ~ppc -s390 x86"
-IUSE="ldirectord doc snmp management"
+IUSE="ldirectord doc snmp management management-gui"
 
 DEPEND="
 	=dev-libs/glib-2*
@@ -38,9 +38,11 @@
 	dev-lang/swig
 	management? (
 		>=dev-lang/python-2.4
-		>=dev-python/pygtk-2.4
 		>=sys-libs/pam-0.78-r3
 	)
+	management-gui? (
+		>=dev-python/pygtk-2.4
+	)
 	"
 
 src_unpack() {
@@ -51,8 +53,6 @@
 }
 
 src_compile() {
-	append-ldflags $(bindnow-flags)
-
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
@@ -128,4 +128,11 @@
 	chown -R cluster:cluster /var/lib/heartbeat/crm
 	chown -R cluster:cluster /var/lib/heartbeat/pengine
 	chown -R cluster:cluster /var/lib/heartbeat/cores/cluster
+	if use management ; then
+		enewgroup haclient
+		elog "If you intend to use the management GUI to configure heartbeat,"
+		elog "you will need to add a user to the haclient group with the command:"
+		elog "\tgpasswd -a <user> haclient"
+		elog "where <user> is the desired username."
+	fi
 }